Unity 8

Merge lp:~aacid/unity8/card_optimizations into lp:unity8

card_optimizations
Merge into trunk

Proposed by Albert Astals Cid on 2014-04-01

Status:

Merged

Approved by:

Michał Sawicz on 2014-04-16

Approved revision:

827

Merged at revision:

855

Proposed branch:

lp:~aacid/unity8/card_optimizations

Merge into:

lp:unity8

Diff against target:

17 lines (+2/-2)

1 file modified

cmake/modules/QmlTest.cmake (+2/-2)

To merge this branch:

bzr merge lp:~aacid/unity8/card_optimizations

High

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Needs Fixing on 2014-04-16
Michał Sawicz		2014-04-01	Approve on 2014-04-16
Review via email: mp+213660@code.launchpad.net

Commit message

Improve Card creation time by adding loaders that make sure only what's needed is loaded

Description of the change

* Are there any related MPs required for this MP to build/function as expected?
No, but i've merged a few yet to be merged MR so the diff will be bigger than it really is

* Did you perform an exploratory manual test run of your code change and any related functionality?
Yes

* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A

* If you changed the UI, has there been a design review?
N/A

In my computer it goes from
RESULT : qmltestrunner::benchmark_time:"cardTitleArtSubtitleMascotSummaryModel":
3.217 msecs per iteration (total: 3,218, iterations: 1000)

RESULT : qmltestrunner::benchmark_time:"cardTitleArtSubtitleMascotModel":
1.647 msecs per iteration (total: 1,648, iterations: 1000)

RESULT : qmltestrunner::benchmark_time:"cardTitleArtSubtitleModel":
1.514 msecs per iteration (total: 1,515, iterations: 1000)

RESULT : qmltestrunner::benchmark_time:"cardTitleArtModel":
1.471 msecs per iteration (total: 1,471, iterations: 1000)

RESULT : qmltestrunner::benchmark_time:"cardArtModel":
1.447 msecs per iteration (total: 1,448, iterations: 1000)

RESULT : qmltestrunner::benchmark_time:"cardTitleModel":
1.276 msecs per iteration (total: 1,276, iterations: 1000)

RESULT : qmltestrunner::benchmark_time:"cardTitleArtSubtitleMascotSummaryModel":
2.916 msecs per iteration (total: 2,917, iterations: 1000)

RESULT : qmltestrunner::benchmark_time:"cardTitleArtSubtitleMascotModel":
1.504 msecs per iteration (total: 1,504, iterations: 1000)

RESULT : qmltestrunner::benchmark_time:"cardTitleArtSubtitleModel":
1.060 msecs per iteration (total: 1,061, iterations: 1000)

RESULT : qmltestrunner::benchmark_time:"cardTitleArtModel":
1.052 msecs per iteration (total: 1,053, iterations: 1000)

RESULT : qmltestrunner::benchmark_time:"cardArtModel":
0.727 msecs per iteration (total: 728, iterations: 1000)

RESULT : qmltestrunner::benchmark_time:"cardTitleModel":
0.817 msecs per iteration (total: 818, iterations: 1000)

Revision history for this message

Michael Zanetti (mzanetti) wrote on 2014-04-01:

825 + width: 700
826 + height: 400

I know most of it hasn't been introduced with this branch, but still a friendly reminder that we should also use units.gu() for tests.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-04-01:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/2699/rebuild

review: Needs Fixing (continuous-integration)

lp:~aacid/unity8/card_optimizations updated on 2014-04-01

814. By Albert Astals Cid on 2014-04-01: Fix carousel
815. By Albert Astals Cid on 2014-04-01: whitespaaaaaaaace

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-04-01:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/2702/rebuild

review: Needs Fixing (continuous-integration)

lp:~aacid/unity8/card_optimizations updated on 2014-04-02

816. By Albert Astals Cid on 2014-04-02: Merge

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-04-02:

FAILED: Continuous integration, rev:816
http://jenkins.qa.ubuntu.com/job/unity8-ci/2710/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4451/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/4051/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/1580
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/1231
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/1235
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/1235/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/1231
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/3848/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4557
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4557/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4084
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4084/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/6306/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/5552

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/2710/rebuild

review: Needs Fixing (continuous-integration)

lp:~aacid/unity8/card_optimizations updated on 2014-04-02

817. By Albert Astals Cid on 2014-04-02: lp:~aacid/unity8/application_manager_install_fix
818. By Albert Astals Cid on 2014-04-02: fix tests

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-04-02:

FAILED: Continuous integration, rev:818
http://jenkins.qa.ubuntu.com/job/unity8-ci/2717/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4466/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/4066/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/1587
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/1238
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/1242
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/1242/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/1238
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/3859/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4572
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4572/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4101
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4101/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/6318/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/5570

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/2717/rebuild

review: Needs Fixing (continuous-integration)

lp:~aacid/unity8/card_optimizations updated on 2014-04-04

819. By Albert Astals Cid on 2014-04-04

Make the Card be inside an async loader

Techincally this should make it so that if you scroll very fast you can end up with an empty
screen but it seems it doesn't happen, i'd say because of UbuntuShape doing something very
blocking somewhere, need to verify

820. By Albert Astals Cid on 2014-04-04

Merge

821. By Albert Astals Cid on 2014-04-04

fix wrong merge ^_^

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-04-04:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/2735/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-04-04:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/2736/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-04-07:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/2743/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Michał Sawicz (saviq) wrote on 2014-04-14:

8 + -iterations 1000

Doesn't that affect all tests?

=====

632 + function init() {
633 + wait(1);
634 + }

Please reorder so that init() is at the top.

=====

637 + currentModel = data.model
638 + cardRepeater.model = 1
639 + cardRepeater.model = 0

Missing semicolons.

review: Needs Fixing

lp:~aacid/unity8/card_optimizations updated on 2014-04-16

822. By Albert Astals Cid on 2014-04-16: Merge
823. By Albert Astals Cid on 2014-04-16: aestetic changes

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-04-16:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/2825/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Michał Sawicz (saviq) wrote on 2014-04-16:

Would be good to get rid of:

file:///home/phablet/shell/qml/Dash/Card.qml:140: TypeError: Cannot read property 'height' of null
file:///home/phablet/shell/qml/Dash/Card.qml:141: TypeError: Cannot read property 'opacity' of null

lp:~aacid/unity8/card_optimizations updated on 2014-04-16

824. By Albert Astals Cid on 2014-04-16: Fix autopilot test

Revision history for this message

Michał Sawicz (saviq) wrote on 2014-04-16:

Art should be in a loader, too, we allow configurations without art.

Revision history for this message

Michał Sawicz (saviq) wrote on 2014-04-16:

property string currentModel: '{}'

Will get rid of a lot of warnings.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-04-16:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/2826/rebuild

review: Needs Fixing (continuous-integration)

lp:~aacid/unity8/card_optimizations updated on 2014-04-16

825. By Albert Astals Cid on 2014-04-16: Get rid of some warnings
826. By Albert Astals Cid on 2014-04-16: Fix some warnings

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-04-16:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/2827/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Albert Astals Cid (aacid) wrote on 2014-04-16:

> Art should be in a loader, too, we allow configurations without art.

I did move the ArtShape into a loader and the cardTitleModel benchmark did not receive any "noticeable gain", results still fluctuated around 0.8, 0.9 in my desktop when running the benchmark.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-04-16:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/2828/rebuild

review: Needs Fixing (continuous-integration)

lp:~aacid/unity8/card_optimizations updated on 2014-04-16

827. By Albert Astals Cid on 2014-04-16: make the iterations a parameter

Revision history for this message

Michał Sawicz (saviq) wrote on 2014-04-16:

* Did you perform an exploratory manual test run of the code change and any related functionality?
Yes, everything seems to work as expected.

* Did CI run pass? If not, please explain why.
Known otto failures.

review: Approve

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-04-16:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/2832/rebuild

review: Needs Fixing (continuous-integration)

lp:~aacid/unity8/card_optimizations updated on 2014-04-17

828. By Albert Astals Cid on 2014-04-16: Pass ARGN down
829. By Albert Astals Cid on 2014-04-17: Merge

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Albert Astals Cid

Mohammad Rakibul Hasan

Unity Team

1	=== modified file 'cmake/modules/QmlTest.cmake'
2	--- cmake/modules/QmlTest.cmake 2014-04-16 13:09:09 +0000
3	+++ cmake/modules/QmlTest.cmake 2014-04-17 11:11:58 +0000
4	@@ -59,11 +59,11 @@
5	endmacro(add_manual_qml_test)
6
7	macro(add_qml_benchmark SUBPATH COMPONENT_NAME ITERATIONS)
8	- add_qml_test_internal(${SUBPATH} ${COMPONENT_NAME} ${ITERATIONS})
9	+ add_qml_test_internal(${SUBPATH} ${COMPONENT_NAME} ${ITERATIONS} ${ARGN})
10	endmacro(add_qml_benchmark)
11
12	macro(add_qml_test SUBPATH COMPONENT_NAME)
13	- add_qml_test_internal(${SUBPATH} ${COMPONENT_NAME} 0)
14	+ add_qml_test_internal(${SUBPATH} ${COMPONENT_NAME} 0 ${ARGN})
15	endmacro(add_qml_test)
16
17	macro(add_qml_test_internal SUBPATH COMPONENT_NAME ITERATIONS)