From b817087875e796302f8679edaa3c42d6e46bb396 Mon Sep 17 00:00:00 2001 From: Stefan Schubert Date: Thu, 29 Aug 2024 13:47:48 +0200 Subject: [PATCH 01/34] first try, windows only --- .yamato/config.metadata | 2 ++ .yamato/upm-ci.yml | 22 ++++++++++++++++++++-- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/.yamato/config.metadata b/.yamato/config.metadata index 216ec0af3b..3eb55cffd9 100644 --- a/.yamato/config.metadata +++ b/.yamato/config.metadata @@ -69,3 +69,5 @@ scripting_backends: - name: il2cpp ios_and_tvos_macos_bokken_image: package-ci/macos-13:v4.50.0 + +performance_only: false diff --git a/.yamato/upm-ci.yml b/.yamato/upm-ci.yml index a5facf7642..59cfb3f9d5 100644 --- a/.yamato/upm-ci.yml +++ b/.yamato/upm-ci.yml @@ -32,7 +32,7 @@ - move /Y .\Packages\com.unity.inputsystem\Samples .\Assets - move /Y .\Packages\com.unity.inputsystem\Samples.meta .\Assets # Now run our full test suite that sits in Assets/Tests by running UTR on our project. - - ./utr --testproject . --timeout=1200 --editor-location=.Editor --artifacts_path=upm-ci~/test-results/isolation-com.unity.inputsystem.tests --suite=playmode {% if platform.name == "win" %} --suite=editor {% endif %} --api-profile=NET_4_6 {% if platform.runtime %} --platform {{ platform.runtime }} {% endif %} {% if platform.scripting-backend %} --scripting-backend {{ platform.scripting-backend }} {% endif %} --report-performance-data --performance-project-id=InputSystem + - ./utr --testproject . --timeout=1200 --editor-location=.Editor --artifacts_path=upm-ci~/test-results/isolation-com.unity.inputsystem.tests --suite=playmode {% if platform.name == "win" %} --suite=editor {% endif %} {% if performance_only == true %} --category=Performance {% endif %}--api-profile=NET_4_6 {% if platform.runtime %} --platform {{ platform.runtime }} {% endif %} {% if platform.scripting-backend %} --scripting-backend {{ platform.scripting-backend }} {% endif %} --report-performance-data --performance-project-id=InputSystem artifacts: UTR_Output.zip: paths: @@ -204,7 +204,7 @@ run_android_{{ editor.version }}_{{ backend.name }}: {% endfor %} all_tests: - name: All Tests + name: All Tests dependencies: {% for editor in editors %} {% for platform in platforms_win %} @@ -230,6 +230,24 @@ all_tests: - targets: only: - "develop" + + +performance_tests_only: + name: Performance Tests Only + performance_only: true + dependencies: + {% for editor in editors %} + {% for platform in platforms_win %} + - .yamato/upm-ci.yml#{{ platform.name }}_{{ editor.version }} + {% endfor %} + {% endfor %} + - .yamato/upm-ci.yml#publish_dryrun + triggers: + recurring: + - branch: develop + frequency: daily + rerun: always + {% for run in (1..2) %} publish{% cycle "", "_dryrun" %}: From 6fec927c474c194ff3130b63b84ca56dc15ee8c5 Mon Sep 17 00:00:00 2001 From: Stefan Schubert Date: Thu, 29 Aug 2024 14:41:37 +0200 Subject: [PATCH 02/34] Update upm-ci.yml --- .yamato/upm-ci.yml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/.yamato/upm-ci.yml b/.yamato/upm-ci.yml index 59cfb3f9d5..f7c0f60790 100644 --- a/.yamato/upm-ci.yml +++ b/.yamato/upm-ci.yml @@ -32,7 +32,7 @@ - move /Y .\Packages\com.unity.inputsystem\Samples .\Assets - move /Y .\Packages\com.unity.inputsystem\Samples.meta .\Assets # Now run our full test suite that sits in Assets/Tests by running UTR on our project. - - ./utr --testproject . --timeout=1200 --editor-location=.Editor --artifacts_path=upm-ci~/test-results/isolation-com.unity.inputsystem.tests --suite=playmode {% if platform.name == "win" %} --suite=editor {% endif %} {% if performance_only == true %} --category=Performance {% endif %}--api-profile=NET_4_6 {% if platform.runtime %} --platform {{ platform.runtime }} {% endif %} {% if platform.scripting-backend %} --scripting-backend {{ platform.scripting-backend }} {% endif %} --report-performance-data --performance-project-id=InputSystem + - ./utr --testproject . --timeout=1200 --editor-location=.Editor --artifacts_path=upm-ci~/test-results/isolation-com.unity.inputsystem.tests --suite=playmode {% if platform.name == "win" %} --suite=editor {% endif %} --category=Performance --api-profile=NET_4_6 {% if platform.runtime %} --platform {{ platform.runtime }} {% endif %} {% if platform.scripting-backend %} --scripting-backend {{ platform.scripting-backend }} {% endif %} --report-performance-data --performance-project-id=InputSystem artifacts: UTR_Output.zip: paths: @@ -236,12 +236,7 @@ performance_tests_only: name: Performance Tests Only performance_only: true dependencies: - {% for editor in editors %} - {% for platform in platforms_win %} - - .yamato/upm-ci.yml#{{ platform.name }}_{{ editor.version }} - {% endfor %} - {% endfor %} - - .yamato/upm-ci.yml#publish_dryrun + - .yamato/upm-ci.yml#win_trunk triggers: recurring: - branch: develop From ea44c5e4fb329527da8d2085f52184c527a751f4 Mon Sep 17 00:00:00 2001 From: Stefan Schubert Date: Thu, 29 Aug 2024 15:26:34 +0200 Subject: [PATCH 03/34] try performance %if% again --- .yamato/config.metadata | 4 +--- .yamato/upm-ci.yml | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.yamato/config.metadata b/.yamato/config.metadata index 3eb55cffd9..32b0cf5567 100644 --- a/.yamato/config.metadata +++ b/.yamato/config.metadata @@ -68,6 +68,4 @@ scripting_backends: - name: mono - name: il2cpp -ios_and_tvos_macos_bokken_image: package-ci/macos-13:v4.50.0 - -performance_only: false +ios_and_tvos_macos_bokken_image: package-ci/macos-13:v4.50.0 \ No newline at end of file diff --git a/.yamato/upm-ci.yml b/.yamato/upm-ci.yml index f7c0f60790..259d77fb4d 100644 --- a/.yamato/upm-ci.yml +++ b/.yamato/upm-ci.yml @@ -32,7 +32,7 @@ - move /Y .\Packages\com.unity.inputsystem\Samples .\Assets - move /Y .\Packages\com.unity.inputsystem\Samples.meta .\Assets # Now run our full test suite that sits in Assets/Tests by running UTR on our project. - - ./utr --testproject . --timeout=1200 --editor-location=.Editor --artifacts_path=upm-ci~/test-results/isolation-com.unity.inputsystem.tests --suite=playmode {% if platform.name == "win" %} --suite=editor {% endif %} --category=Performance --api-profile=NET_4_6 {% if platform.runtime %} --platform {{ platform.runtime }} {% endif %} {% if platform.scripting-backend %} --scripting-backend {{ platform.scripting-backend }} {% endif %} --report-performance-data --performance-project-id=InputSystem + - ./utr --testproject . --timeout=1200 --editor-location=.Editor --artifacts_path=upm-ci~/test-results/isolation-com.unity.inputsystem.tests --suite=playmode {% if platform.name == "win" %} --suite=editor {% endif %} {% if performance_only %}--category=Performance {% endif %} --api-profile=NET_4_6 {% if platform.runtime %} --platform {{ platform.runtime }} {% endif %} {% if platform.scripting-backend %} --scripting-backend {{ platform.scripting-backend }} {% endif %} --report-performance-data --performance-project-id=InputSystem artifacts: UTR_Output.zip: paths: From c498801cddb19825261e039dc3f0ec8ddf43ef92 Mon Sep 17 00:00:00 2001 From: Stefan Schubert Date: Thu, 29 Aug 2024 15:48:59 +0200 Subject: [PATCH 04/34] Update upm-ci.yml --- .yamato/upm-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.yamato/upm-ci.yml b/.yamato/upm-ci.yml index 259d77fb4d..7aaa5f8445 100644 --- a/.yamato/upm-ci.yml +++ b/.yamato/upm-ci.yml @@ -32,7 +32,7 @@ - move /Y .\Packages\com.unity.inputsystem\Samples .\Assets - move /Y .\Packages\com.unity.inputsystem\Samples.meta .\Assets # Now run our full test suite that sits in Assets/Tests by running UTR on our project. - - ./utr --testproject . --timeout=1200 --editor-location=.Editor --artifacts_path=upm-ci~/test-results/isolation-com.unity.inputsystem.tests --suite=playmode {% if platform.name == "win" %} --suite=editor {% endif %} {% if performance_only %}--category=Performance {% endif %} --api-profile=NET_4_6 {% if platform.runtime %} --platform {{ platform.runtime }} {% endif %} {% if platform.scripting-backend %} --scripting-backend {{ platform.scripting-backend }} {% endif %} --report-performance-data --performance-project-id=InputSystem + - ./utr --testproject . --timeout=1200 --editor-location=.Editor --artifacts_path=upm-ci~/test-results/isolation-com.unity.inputsystem.tests --suite=playmode {% if platform.name == "win" %} --suite=editor {% endif %} {% if performance_only == "true" %}--category=Performance {% endif %} --api-profile=NET_4_6 {% if platform.runtime %} --platform {{ platform.runtime }} {% endif %} {% if platform.scripting-backend %} --scripting-backend {{ platform.scripting-backend }} {% endif %} --report-performance-data --performance-project-id=InputSystem artifacts: UTR_Output.zip: paths: From 90320b616c114260bb8fdf2a16a385e2b13ba6b7 Mon Sep 17 00:00:00 2001 From: Stefan Schubert Date: Thu, 29 Aug 2024 16:01:54 +0200 Subject: [PATCH 05/34] Update upm-ci.yml --- .yamato/upm-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.yamato/upm-ci.yml b/.yamato/upm-ci.yml index 7aaa5f8445..259d77fb4d 100644 --- a/.yamato/upm-ci.yml +++ b/.yamato/upm-ci.yml @@ -32,7 +32,7 @@ - move /Y .\Packages\com.unity.inputsystem\Samples .\Assets - move /Y .\Packages\com.unity.inputsystem\Samples.meta .\Assets # Now run our full test suite that sits in Assets/Tests by running UTR on our project. - - ./utr --testproject . --timeout=1200 --editor-location=.Editor --artifacts_path=upm-ci~/test-results/isolation-com.unity.inputsystem.tests --suite=playmode {% if platform.name == "win" %} --suite=editor {% endif %} {% if performance_only == "true" %}--category=Performance {% endif %} --api-profile=NET_4_6 {% if platform.runtime %} --platform {{ platform.runtime }} {% endif %} {% if platform.scripting-backend %} --scripting-backend {{ platform.scripting-backend }} {% endif %} --report-performance-data --performance-project-id=InputSystem + - ./utr --testproject . --timeout=1200 --editor-location=.Editor --artifacts_path=upm-ci~/test-results/isolation-com.unity.inputsystem.tests --suite=playmode {% if platform.name == "win" %} --suite=editor {% endif %} {% if performance_only %}--category=Performance {% endif %} --api-profile=NET_4_6 {% if platform.runtime %} --platform {{ platform.runtime }} {% endif %} {% if platform.scripting-backend %} --scripting-backend {{ platform.scripting-backend }} {% endif %} --report-performance-data --performance-project-id=InputSystem artifacts: UTR_Output.zip: paths: From 8e9ebf948214d6bfb6b247f0e787dd803f2d83e3 Mon Sep 17 00:00:00 2001 From: Stefan Schubert Date: Thu, 29 Aug 2024 16:59:33 +0200 Subject: [PATCH 06/34] redo config variable --- .yamato/config.metadata | 4 +++- .yamato/upm-ci.yml | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.yamato/config.metadata b/.yamato/config.metadata index 32b0cf5567..3d8cd0dc71 100644 --- a/.yamato/config.metadata +++ b/.yamato/config.metadata @@ -68,4 +68,6 @@ scripting_backends: - name: mono - name: il2cpp -ios_and_tvos_macos_bokken_image: package-ci/macos-13:v4.50.0 \ No newline at end of file +ios_and_tvos_macos_bokken_image: package-ci/macos-13:v4.50.0 + +performance_only: true \ No newline at end of file diff --git a/.yamato/upm-ci.yml b/.yamato/upm-ci.yml index 259d77fb4d..179ea82970 100644 --- a/.yamato/upm-ci.yml +++ b/.yamato/upm-ci.yml @@ -32,7 +32,7 @@ - move /Y .\Packages\com.unity.inputsystem\Samples .\Assets - move /Y .\Packages\com.unity.inputsystem\Samples.meta .\Assets # Now run our full test suite that sits in Assets/Tests by running UTR on our project. - - ./utr --testproject . --timeout=1200 --editor-location=.Editor --artifacts_path=upm-ci~/test-results/isolation-com.unity.inputsystem.tests --suite=playmode {% if platform.name == "win" %} --suite=editor {% endif %} {% if performance_only %}--category=Performance {% endif %} --api-profile=NET_4_6 {% if platform.runtime %} --platform {{ platform.runtime }} {% endif %} {% if platform.scripting-backend %} --scripting-backend {{ platform.scripting-backend }} {% endif %} --report-performance-data --performance-project-id=InputSystem + - ./utr --testproject . --timeout=1200 --editor-location=.Editor --artifacts_path=upm-ci~/test-results/isolation-com.unity.inputsystem.tests --suite=playmode {% if platform.name == "win" %} --suite=editor {% endif %} {% if performance_only == true %} --category=Performance {% endif %} --api-profile=NET_4_6 {% if platform.runtime %} --platform {{ platform.runtime }} {% endif %} {% if platform.scripting-backend %} --scripting-backend {{ platform.scripting-backend }} {% endif %} --report-performance-data --performance-project-id=InputSystem artifacts: UTR_Output.zip: paths: From 61c396718897f043f926bbb7d9ccc170cf22a932 Mon Sep 17 00:00:00 2001 From: Stefan Schubert Date: Thu, 29 Aug 2024 17:26:01 +0200 Subject: [PATCH 07/34] Update upm-ci.yml --- .yamato/upm-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.yamato/upm-ci.yml b/.yamato/upm-ci.yml index 179ea82970..0f98faa277 100644 --- a/.yamato/upm-ci.yml +++ b/.yamato/upm-ci.yml @@ -32,7 +32,7 @@ - move /Y .\Packages\com.unity.inputsystem\Samples .\Assets - move /Y .\Packages\com.unity.inputsystem\Samples.meta .\Assets # Now run our full test suite that sits in Assets/Tests by running UTR on our project. - - ./utr --testproject . --timeout=1200 --editor-location=.Editor --artifacts_path=upm-ci~/test-results/isolation-com.unity.inputsystem.tests --suite=playmode {% if platform.name == "win" %} --suite=editor {% endif %} {% if performance_only == true %} --category=Performance {% endif %} --api-profile=NET_4_6 {% if platform.runtime %} --platform {{ platform.runtime }} {% endif %} {% if platform.scripting-backend %} --scripting-backend {{ platform.scripting-backend }} {% endif %} --report-performance-data --performance-project-id=InputSystem + - ./utr --testproject . --timeout=1200 --editor-location=.Editor --artifacts_path=upm-ci~/test-results/isolation-com.unity.inputsystem.tests --suite=playmode {% if platform.name == "win" %} --suite=editor {% endif %} {% if performance_only %} --category=Performance {% endif %} --api-profile=NET_4_6 {% if platform.runtime %} --platform {{ platform.runtime }} {% endif %} {% if platform.scripting-backend %} --scripting-backend {{ platform.scripting-backend }} {% endif %} --report-performance-data --performance-project-id=InputSystem artifacts: UTR_Output.zip: paths: From 5bddef359e95966e8fb57c8f0441834006dd4a62 Mon Sep 17 00:00:00 2001 From: Stefan Schubert Date: Thu, 29 Aug 2024 17:45:20 +0200 Subject: [PATCH 08/34] Update config.metadata --- .yamato/config.metadata | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.yamato/config.metadata b/.yamato/config.metadata index 3d8cd0dc71..43731c86c6 100644 --- a/.yamato/config.metadata +++ b/.yamato/config.metadata @@ -70,4 +70,4 @@ scripting_backends: ios_and_tvos_macos_bokken_image: package-ci/macos-13:v4.50.0 -performance_only: true \ No newline at end of file +performance_only: false \ No newline at end of file From 4458930d778b00dd5c97afd698660b9506c9833a Mon Sep 17 00:00:00 2001 From: Stefan Schubert Date: Fri, 30 Aug 2024 11:15:55 +0200 Subject: [PATCH 09/34] change job definition to use variable --- .yamato/config.metadata | 4 +--- .yamato/upm-ci.yml | 6 +++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.yamato/config.metadata b/.yamato/config.metadata index 43731c86c6..2852b4693c 100644 --- a/.yamato/config.metadata +++ b/.yamato/config.metadata @@ -68,6 +68,4 @@ scripting_backends: - name: mono - name: il2cpp -ios_and_tvos_macos_bokken_image: package-ci/macos-13:v4.50.0 - -performance_only: false \ No newline at end of file +ios_and_tvos_macos_bokken_image: package-ci/macos-13:v4.50.0 \ No newline at end of file diff --git a/.yamato/upm-ci.yml b/.yamato/upm-ci.yml index 0f98faa277..01ad618047 100644 --- a/.yamato/upm-ci.yml +++ b/.yamato/upm-ci.yml @@ -3,7 +3,7 @@ {% for editor in editors %} {% for platform in platforms_win %} -{{ platform.name }}_{{ editor.version }}: +{{ platform.name }}_{{ editor.version }}_{{ test_category }}: name : Build and Test version {{ editor.version }} on {{ platform.name }} agent: type: {{ platform.type }} @@ -32,7 +32,7 @@ - move /Y .\Packages\com.unity.inputsystem\Samples .\Assets - move /Y .\Packages\com.unity.inputsystem\Samples.meta .\Assets # Now run our full test suite that sits in Assets/Tests by running UTR on our project. - - ./utr --testproject . --timeout=1200 --editor-location=.Editor --artifacts_path=upm-ci~/test-results/isolation-com.unity.inputsystem.tests --suite=playmode {% if platform.name == "win" %} --suite=editor {% endif %} {% if performance_only %} --category=Performance {% endif %} --api-profile=NET_4_6 {% if platform.runtime %} --platform {{ platform.runtime }} {% endif %} {% if platform.scripting-backend %} --scripting-backend {{ platform.scripting-backend }} {% endif %} --report-performance-data --performance-project-id=InputSystem + - ./utr --testproject . --timeout=1200 --editor-location=.Editor --artifacts_path=upm-ci~/test-results/isolation-com.unity.inputsystem.tests --suite=playmode {% if platform.name == "win" %} --suite=editor {% endif %} {% if test_category == "performance" %} --category=Performance {% endif %} --api-profile=NET_4_6 {% if platform.runtime %} --platform {{ platform.runtime }} {% endif %} {% if platform.scripting-backend %} --scripting-backend {{ platform.scripting-backend }} {% endif %} --report-performance-data --performance-project-id=InputSystem artifacts: UTR_Output.zip: paths: @@ -236,7 +236,7 @@ performance_tests_only: name: Performance Tests Only performance_only: true dependencies: - - .yamato/upm-ci.yml#win_trunk + - .yamato/upm-ci.yml#win_trunk_performance triggers: recurring: - branch: develop From 4e134d339121d78c0f31e47044a4525fe934f607 Mon Sep 17 00:00:00 2001 From: Stefan Schubert Date: Fri, 30 Aug 2024 11:18:18 +0200 Subject: [PATCH 10/34] Update config.metadata --- .yamato/config.metadata | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.yamato/config.metadata b/.yamato/config.metadata index 2852b4693c..f0c35c682b 100644 --- a/.yamato/config.metadata +++ b/.yamato/config.metadata @@ -68,4 +68,6 @@ scripting_backends: - name: mono - name: il2cpp -ios_and_tvos_macos_bokken_image: package-ci/macos-13:v4.50.0 \ No newline at end of file +ios_and_tvos_macos_bokken_image: package-ci/macos-13:v4.50.0 + +test_category: performance \ No newline at end of file From fb8d5cd3268b075d745715b4a9bf61eacd73ebca Mon Sep 17 00:00:00 2001 From: Stefan Schubert Date: Fri, 30 Aug 2024 11:27:17 +0200 Subject: [PATCH 11/34] update --- .yamato/config.metadata | 4 +++- .yamato/upm-ci.yml | 1 - 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.yamato/config.metadata b/.yamato/config.metadata index f0c35c682b..98b30ee34a 100644 --- a/.yamato/config.metadata +++ b/.yamato/config.metadata @@ -70,4 +70,6 @@ scripting_backends: ios_and_tvos_macos_bokken_image: package-ci/macos-13:v4.50.0 -test_category: performance \ No newline at end of file +test_category: + - name: performance + - name: all \ No newline at end of file diff --git a/.yamato/upm-ci.yml b/.yamato/upm-ci.yml index 01ad618047..97871ab5f3 100644 --- a/.yamato/upm-ci.yml +++ b/.yamato/upm-ci.yml @@ -234,7 +234,6 @@ all_tests: performance_tests_only: name: Performance Tests Only - performance_only: true dependencies: - .yamato/upm-ci.yml#win_trunk_performance triggers: From fefc4247838b8a8b3d27bad0679a79f183391af2 Mon Sep 17 00:00:00 2001 From: Stefan Schubert Date: Fri, 30 Aug 2024 11:28:50 +0200 Subject: [PATCH 12/34] Update upm-ci.yml --- .yamato/upm-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.yamato/upm-ci.yml b/.yamato/upm-ci.yml index 97871ab5f3..4b1c9db754 100644 --- a/.yamato/upm-ci.yml +++ b/.yamato/upm-ci.yml @@ -3,7 +3,7 @@ {% for editor in editors %} {% for platform in platforms_win %} -{{ platform.name }}_{{ editor.version }}_{{ test_category }}: +{{ platform.name }}_{{ editor.version }}_{{ test_category.name }}: name : Build and Test version {{ editor.version }} on {{ platform.name }} agent: type: {{ platform.type }} From 477dd42207fa2cedc610eaf9e14bf963efe04d2e Mon Sep 17 00:00:00 2001 From: Stefan Schubert Date: Fri, 30 Aug 2024 11:37:51 +0200 Subject: [PATCH 13/34] Update upm-ci.yml --- .yamato/upm-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.yamato/upm-ci.yml b/.yamato/upm-ci.yml index 4b1c9db754..1c8f5815f8 100644 --- a/.yamato/upm-ci.yml +++ b/.yamato/upm-ci.yml @@ -4,7 +4,7 @@ {% for editor in editors %} {% for platform in platforms_win %} {{ platform.name }}_{{ editor.version }}_{{ test_category.name }}: - name : Build and Test version {{ editor.version }} on {{ platform.name }} + name : Build and Test version {{ editor.version }} on {{ platform.name }}, {{ test_category.name }} Tests agent: type: {{ platform.type }} image: {{ platform.image }} @@ -32,7 +32,7 @@ - move /Y .\Packages\com.unity.inputsystem\Samples .\Assets - move /Y .\Packages\com.unity.inputsystem\Samples.meta .\Assets # Now run our full test suite that sits in Assets/Tests by running UTR on our project. - - ./utr --testproject . --timeout=1200 --editor-location=.Editor --artifacts_path=upm-ci~/test-results/isolation-com.unity.inputsystem.tests --suite=playmode {% if platform.name == "win" %} --suite=editor {% endif %} {% if test_category == "performance" %} --category=Performance {% endif %} --api-profile=NET_4_6 {% if platform.runtime %} --platform {{ platform.runtime }} {% endif %} {% if platform.scripting-backend %} --scripting-backend {{ platform.scripting-backend }} {% endif %} --report-performance-data --performance-project-id=InputSystem + - ./utr --testproject . --timeout=1200 --editor-location=.Editor --artifacts_path=upm-ci~/test-results/isolation-com.unity.inputsystem.tests --suite=playmode {% if platform.name == "win" %} --suite=editor {% endif %} {% if test_category.name == "performance" %} --category=Performance {% endif %} --api-profile=NET_4_6 {% if platform.runtime %} --platform {{ platform.runtime }} {% endif %} {% if platform.scripting-backend %} --scripting-backend {{ platform.scripting-backend }} {% endif %} --report-performance-data --performance-project-id=InputSystem artifacts: UTR_Output.zip: paths: @@ -235,7 +235,7 @@ all_tests: performance_tests_only: name: Performance Tests Only dependencies: - - .yamato/upm-ci.yml#win_trunk_performance + - .yamato/upm-ci.yml#win_trunk_{{ test_category.performance }} triggers: recurring: - branch: develop From ce2ba0bbb5477c598245f2dc6ae7af613ea7684d Mon Sep 17 00:00:00 2001 From: Stefan Schubert Date: Fri, 30 Aug 2024 12:02:37 +0200 Subject: [PATCH 14/34] Update upm-ci.yml --- .yamato/upm-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.yamato/upm-ci.yml b/.yamato/upm-ci.yml index 1c8f5815f8..e4bec6b289 100644 --- a/.yamato/upm-ci.yml +++ b/.yamato/upm-ci.yml @@ -235,7 +235,7 @@ all_tests: performance_tests_only: name: Performance Tests Only dependencies: - - .yamato/upm-ci.yml#win_trunk_{{ test_category.performance }} + - .yamato/upm-ci.yml#win_trunk_{{ test_category.name.performance }} triggers: recurring: - branch: develop From 9f044b378de6d48dc70e53e05ba15f10cfc421a3 Mon Sep 17 00:00:00 2001 From: Stefan Schubert Date: Fri, 30 Aug 2024 14:03:05 +0200 Subject: [PATCH 15/34] Update upm-ci.yml --- .yamato/upm-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.yamato/upm-ci.yml b/.yamato/upm-ci.yml index e4bec6b289..d69ff4f1f3 100644 --- a/.yamato/upm-ci.yml +++ b/.yamato/upm-ci.yml @@ -235,7 +235,7 @@ all_tests: performance_tests_only: name: Performance Tests Only dependencies: - - .yamato/upm-ci.yml#win_trunk_{{ test_category.name.performance }} + - .yamato/upm-ci.yml#win_trunk_performance triggers: recurring: - branch: develop From a4fab323556a7acb151d80a7f4ded8ad7e0d60c5 Mon Sep 17 00:00:00 2001 From: Stefan Schubert Date: Fri, 30 Aug 2024 14:07:45 +0200 Subject: [PATCH 16/34] asd --- .yamato/config.metadata | 4 ++-- .yamato/upm-ci.yml | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.yamato/config.metadata b/.yamato/config.metadata index 98b30ee34a..554884dfef 100644 --- a/.yamato/config.metadata +++ b/.yamato/config.metadata @@ -71,5 +71,5 @@ scripting_backends: ios_and_tvos_macos_bokken_image: package-ci/macos-13:v4.50.0 test_category: - - name: performance - - name: all \ No newline at end of file + - name: Performance + - name: All \ No newline at end of file diff --git a/.yamato/upm-ci.yml b/.yamato/upm-ci.yml index d69ff4f1f3..ce9d9de0de 100644 --- a/.yamato/upm-ci.yml +++ b/.yamato/upm-ci.yml @@ -3,8 +3,9 @@ {% for editor in editors %} {% for platform in platforms_win %} -{{ platform.name }}_{{ editor.version }}_{{ test_category.name }}: - name : Build and Test version {{ editor.version }} on {{ platform.name }}, {{ test_category.name }} Tests +{% for category in test_category %} +{{ platform.name }}_{{ editor.version }}_{{ category.name }}: + name : Build and Test version {{ editor.version }} on {{ platform.name }}, {{ category.name }} Tests agent: type: {{ platform.type }} image: {{ platform.image }} @@ -32,11 +33,12 @@ - move /Y .\Packages\com.unity.inputsystem\Samples .\Assets - move /Y .\Packages\com.unity.inputsystem\Samples.meta .\Assets # Now run our full test suite that sits in Assets/Tests by running UTR on our project. - - ./utr --testproject . --timeout=1200 --editor-location=.Editor --artifacts_path=upm-ci~/test-results/isolation-com.unity.inputsystem.tests --suite=playmode {% if platform.name == "win" %} --suite=editor {% endif %} {% if test_category.name == "performance" %} --category=Performance {% endif %} --api-profile=NET_4_6 {% if platform.runtime %} --platform {{ platform.runtime }} {% endif %} {% if platform.scripting-backend %} --scripting-backend {{ platform.scripting-backend }} {% endif %} --report-performance-data --performance-project-id=InputSystem + - ./utr --testproject . --timeout=1200 --editor-location=.Editor --artifacts_path=upm-ci~/test-results/isolation-com.unity.inputsystem.tests --suite=playmode {% if platform.name == "win" %} --suite=editor {% endif %} {% if category.name == "Performance" %} --category=Performance {% endif %} --api-profile=NET_4_6 {% if platform.runtime %} --platform {{ platform.runtime }} {% endif %} {% if platform.scripting-backend %} --scripting-backend {{ platform.scripting-backend }} {% endif %} --report-performance-data --performance-project-id=InputSystem artifacts: UTR_Output.zip: paths: - "upm-ci~/test-results/**/*" +{% endfor %} # category {% endfor %} {% for platform in platforms_nix %} {{ platform.name }}_{{ editor.version }}: From a4440da1b8a19f421b52412c5991d3a8f2f8ae83 Mon Sep 17 00:00:00 2001 From: Stefan Schubert Date: Fri, 30 Aug 2024 14:09:51 +0200 Subject: [PATCH 17/34] lower case --- .yamato/config.metadata | 4 ++-- .yamato/upm-ci.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.yamato/config.metadata b/.yamato/config.metadata index 554884dfef..98b30ee34a 100644 --- a/.yamato/config.metadata +++ b/.yamato/config.metadata @@ -71,5 +71,5 @@ scripting_backends: ios_and_tvos_macos_bokken_image: package-ci/macos-13:v4.50.0 test_category: - - name: Performance - - name: All \ No newline at end of file + - name: performance + - name: all \ No newline at end of file diff --git a/.yamato/upm-ci.yml b/.yamato/upm-ci.yml index ce9d9de0de..1af88154e9 100644 --- a/.yamato/upm-ci.yml +++ b/.yamato/upm-ci.yml @@ -5,7 +5,7 @@ {% for platform in platforms_win %} {% for category in test_category %} {{ platform.name }}_{{ editor.version }}_{{ category.name }}: - name : Build and Test version {{ editor.version }} on {{ platform.name }}, {{ category.name }} Tests + name : Build and Test version {{ editor.version }} on {{ platform.name }}, {{ category.name }} tests agent: type: {{ platform.type }} image: {{ platform.image }} @@ -33,7 +33,7 @@ - move /Y .\Packages\com.unity.inputsystem\Samples .\Assets - move /Y .\Packages\com.unity.inputsystem\Samples.meta .\Assets # Now run our full test suite that sits in Assets/Tests by running UTR on our project. - - ./utr --testproject . --timeout=1200 --editor-location=.Editor --artifacts_path=upm-ci~/test-results/isolation-com.unity.inputsystem.tests --suite=playmode {% if platform.name == "win" %} --suite=editor {% endif %} {% if category.name == "Performance" %} --category=Performance {% endif %} --api-profile=NET_4_6 {% if platform.runtime %} --platform {{ platform.runtime }} {% endif %} {% if platform.scripting-backend %} --scripting-backend {{ platform.scripting-backend }} {% endif %} --report-performance-data --performance-project-id=InputSystem + - ./utr --testproject . --timeout=1200 --editor-location=.Editor --artifacts_path=upm-ci~/test-results/isolation-com.unity.inputsystem.tests --suite=playmode {% if platform.name == "win" %} --suite=editor {% endif %} {% if category.name == "performance" %} --category=Performance {% endif %} --api-profile=NET_4_6 {% if platform.runtime %} --platform {{ platform.runtime }} {% endif %} {% if platform.scripting-backend %} --scripting-backend {{ platform.scripting-backend }} {% endif %} --report-performance-data --performance-project-id=InputSystem artifacts: UTR_Output.zip: paths: From e4425b4cf458bf9c0d92c5c41f90af4cc6257c8f Mon Sep 17 00:00:00 2001 From: Stefan Schubert Date: Fri, 30 Aug 2024 14:43:20 +0200 Subject: [PATCH 18/34] Update upm-ci.yml --- .yamato/upm-ci.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.yamato/upm-ci.yml b/.yamato/upm-ci.yml index 1af88154e9..581a9edc93 100644 --- a/.yamato/upm-ci.yml +++ b/.yamato/upm-ci.yml @@ -237,7 +237,11 @@ all_tests: performance_tests_only: name: Performance Tests Only dependencies: - - .yamato/upm-ci.yml#win_trunk_performance + {% for editor in editors %} + {% for platform in platforms_win %} + - .yamato/upm-ci.yml#{{ platform.name }}_{{ editor.version }}_performance + {% endfor %} + {% endfor %} triggers: recurring: - branch: develop From 95aaaef050d1d05e5811577607fa3fc76cddbdcf Mon Sep 17 00:00:00 2001 From: Stefan Schubert Date: Fri, 30 Aug 2024 14:52:59 +0200 Subject: [PATCH 19/34] enable for all performance platforms --- .yamato/upm-ci.yml | 40 +++++++++++++++++++++++----------------- 1 file changed, 23 insertions(+), 17 deletions(-) diff --git a/.yamato/upm-ci.yml b/.yamato/upm-ci.yml index 581a9edc93..f4245448ac 100644 --- a/.yamato/upm-ci.yml +++ b/.yamato/upm-ci.yml @@ -41,8 +41,8 @@ {% endfor %} # category {% endfor %} {% for platform in platforms_nix %} -{{ platform.name }}_{{ editor.version }}: - name : Build and Test version {{ editor.version }} on {{ platform.name }} +{{ platform.name }}_{{ editor.version }}_{{ category.name }}: + name : Build and Test version {{ editor.version }} on {{ platform.name }}, {{ category.name }} tests agent: type: {{ platform.type }} image: {{ platform.image }} @@ -69,7 +69,7 @@ - mv ./Packages/com.unity.inputsystem/Samples ./Assets - mv ./Packages/com.unity.inputsystem/Samples.meta ./Assets # Now run our full test suite that sits in Assets/Tests by running UTR on our project. - - ./utr --testproject . --timeout=1200 --editor-location=.Editor --artifacts_path=upm-ci~/test-results/isolation-com.unity.inputsystem.tests --suite=playmode {% if platform.name == "mac" %} --suite=editor {% endif %} {% if platform.name == "linux" %} --suite=editor {% endif %} --api-profile=NET_4_6 {% if platform.runtime %} --platform {{ platform.runtime }} {% endif %} {% if platform.scripting-backend %} --scripting-backend {{ platform.scripting-backend }} {% endif %} --report-performance-data --performance-project-id=InputSystem + - ./utr --testproject . --timeout=1200 --editor-location=.Editor --artifacts_path=upm-ci~/test-results/isolation-com.unity.inputsystem.tests --suite=playmode {% if platform.name == "mac" %} --suite=editor {% endif %} {% if platform.name == "linux" %} --suite=editor {% endif %} {% if category.name == "performance" %} --category=Performance {% endif %} --api-profile=NET_4_6 {% if platform.runtime %} --platform {{ platform.runtime }} {% endif %} {% if platform.scripting-backend %} --scripting-backend {{ platform.scripting-backend }} {% endif %} --report-performance-data --performance-project-id=InputSystem artifacts: UTR_Output.zip: paths: @@ -78,8 +78,8 @@ {% endfor %} {% for editor in editors %} -build_ios_{{ editor.version }}: - name: Build Tests on {{ editor.version }} on ios +build_ios_{{ editor.version }}_{{ category.name }}: + name: Build Tests on {{ editor.version }} on ios, {{ category.name }} tests agent: type: Unity::VM::osx image: {{ ios_and_tvos_macos_bokken_image }} @@ -88,7 +88,7 @@ build_ios_{{ editor.version }}: - {{ utr_install_nix }} - {{ unity_downloader_install }} - unity-downloader-cli -c Editor -c iOS -u {{ editor.version }} --fast --wait - - ./utr --suite=playmode --platform=iOS --editor-location=.Editor --testproject=. --player-save-path=build/players --artifacts_path=build/logs --build-only --report-performance-data --performance-project-id=InputSystem + - ./utr --suite=playmode {% if category.name == "performance" %} --category=Performance {% endif %} --platform=iOS --editor-location=.Editor --testproject=. --player-save-path=build/players --artifacts_path=build/logs --build-only --report-performance-data --performance-project-id=InputSystem artifacts: players: paths: @@ -97,8 +97,8 @@ build_ios_{{ editor.version }}: paths: - "build/logs/**" -run_ios_{{ editor.version }}: - name: Run Tests on {{ editor.version }} on ios +run_ios_{{ editor.version }}_{{ category.name }}: + name: Run Tests on {{ editor.version }} on ios, {{ category.name }} tests agent: type: Unity::mobile::iPhone image: {{ ios_and_tvos_macos_bokken_image }} @@ -109,7 +109,7 @@ run_ios_{{ editor.version }}: - .yamato/upm-ci.yml#build_ios_{{ editor.version }} commands: - {{ utr_install_nix }} - - ./utr --suite=playmode --platform=iOS --player-load-path=build/players --artifacts_path=build/test-results --report-performance-data --performance-project-id=InputSystem + - ./utr --suite=playmode {% if category.name == "performance" %} --category=Performance {% endif %} --platform=iOS --player-load-path=build/players --artifacts_path=build/test-results --report-performance-data --performance-project-id=InputSystem artifacts: logs: paths: @@ -152,8 +152,8 @@ run_tvos_{{ editor.version }}: - "build/test-results/**" {% for backend in scripting_backends %} -build_android_{{ editor.version }}_{{ backend.name }}: - name: Build Tests on {{ editor.version }} on android {{ backend.name }} +build_android_{{ editor.version }}_{{ backend.name }}_{{ category.name }}: + name: Build Tests on {{ editor.version }} on android {{ backend.name }}, {{ category.name }} tests agent: type: Unity::VM image: package-ci/win10:default @@ -162,7 +162,7 @@ build_android_{{ editor.version }}_{{ backend.name }}: - {{ utr_install_win }} - {{ unity_downloader_install }} - unity-downloader-cli -c Editor -c Android -u {{ editor.version }} --fast --wait - - ./utr --suite=playmode --platform=Android --editor-location=.Editor --testproject=. --player-save-path=build/players --artifacts_path=build/logs --scripting-backend={{ backend.name }} --build-only --repository --performance-project-id=InputSystem + - ./utr --suite=playmode {% if category.name == "performance" %} --category=Performance {% endif %} --platform=Android --editor-location=.Editor --testproject=. --player-save-path=build/players --artifacts_path=build/logs --scripting-backend={{ backend.name }} --build-only --repository --performance-project-id=InputSystem artifacts: players: paths: @@ -171,8 +171,8 @@ build_android_{{ editor.version }}_{{ backend.name }}: paths: - "build/logs/**" -run_android_{{ editor.version }}_{{ backend.name }}: - name: Run Tests on {{ editor.version }} on android {{ backend.name }} +run_android_{{ editor.version }}_{{ backend.name }}_{{ category.name }}: + name: Run Tests on {{ editor.version }} on android {{ backend.name }}, {{ category.name }} tests agent: type: Unity::mobile::shield image: package-ci/win10:default @@ -191,7 +191,7 @@ run_android_{{ editor.version }}_{{ backend.name }}: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP% # List the connected devices start %ANDROID_SDK_ROOT%\platform-tools\adb.exe devices - ./utr --suite=playmode --platform=android --player-load-path=build/players --artifacts_path=build/test-results --report-performance-data --performance-project-id=InputSystem + ./utr --suite=playmode {% if category.name == "performance" %} --category=Performance {% endif %} --platform=android --player-load-path=build/players --artifacts_path=build/test-results --report-performance-data --performance-project-id=InputSystem after: - start %ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP% - if not exist build\test-results mkdir build\test-results @@ -241,13 +241,19 @@ performance_tests_only: {% for platform in platforms_win %} - .yamato/upm-ci.yml#{{ platform.name }}_{{ editor.version }}_performance {% endfor %} + {% for platform in platforms_nix %} + - .yamato/upm-ci.yml#{{ platform.name }}_{{ editor.version }}_performance + {% endfor %} + {% for backend in scripting_backends %} + - .yamato/upm-ci.yml#run_android_{{ editor.version }}_{{ backend.name }}_performance + {% endfor %} + - .yamato/upm-ci.yml#run_ios_{{ editor.version }}_performance {% endfor %} triggers: recurring: - branch: develop frequency: daily - rerun: always - + rerun: always {% for run in (1..2) %} publish{% cycle "", "_dryrun" %}: From c571910361868218468143fb45a31f2fb41673cd Mon Sep 17 00:00:00 2001 From: Stefan Schubert Date: Fri, 30 Aug 2024 14:56:31 +0200 Subject: [PATCH 20/34] Update upm-ci.yml --- .yamato/upm-ci.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.yamato/upm-ci.yml b/.yamato/upm-ci.yml index f4245448ac..b41f7d523c 100644 --- a/.yamato/upm-ci.yml +++ b/.yamato/upm-ci.yml @@ -41,6 +41,7 @@ {% endfor %} # category {% endfor %} {% for platform in platforms_nix %} +{% for category in test_category %} {{ platform.name }}_{{ editor.version }}_{{ category.name }}: name : Build and Test version {{ editor.version }} on {{ platform.name }}, {{ category.name }} tests agent: @@ -76,8 +77,10 @@ - "upm-ci~/test-results/**/*" {% endfor %} {% endfor %} +{% endfor %} {% for editor in editors %} +{% for category in test_category %} build_ios_{{ editor.version }}_{{ category.name }}: name: Build Tests on {{ editor.version }} on ios, {{ category.name }} tests agent: @@ -114,6 +117,7 @@ run_ios_{{ editor.version }}_{{ category.name }}: logs: paths: - "build/test-results/**" +{% endfor %} #category build_tvos_{{ editor.version }}: name: Build Tests on {{ editor.version }} on tvos @@ -152,6 +156,7 @@ run_tvos_{{ editor.version }}: - "build/test-results/**" {% for backend in scripting_backends %} +{% for category in test_category %} build_android_{{ editor.version }}_{{ backend.name }}_{{ category.name }}: name: Build Tests on {{ editor.version }} on android {{ backend.name }}, {{ category.name }} tests agent: @@ -201,6 +206,7 @@ run_android_{{ editor.version }}_{{ backend.name }}_{{ category.name }}: logs: paths: - "build/test-results/**" +{% endfor %} #category {% endfor %} {% endfor %} From 18eb2f6e5ed345e65dd4f9f41093acbbdd443d03 Mon Sep 17 00:00:00 2001 From: Stefan Schubert Date: Fri, 30 Aug 2024 17:55:42 +0200 Subject: [PATCH 21/34] dependency fix --- .yamato/upm-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.yamato/upm-ci.yml b/.yamato/upm-ci.yml index b41f7d523c..e8354d1b30 100644 --- a/.yamato/upm-ci.yml +++ b/.yamato/upm-ci.yml @@ -109,7 +109,7 @@ run_ios_{{ editor.version }}_{{ category.name }}: flavor: b1.medium skip_checkout: true dependencies: - - .yamato/upm-ci.yml#build_ios_{{ editor.version }} + - .yamato/upm-ci.yml#build_ios_{{ editor.version }}_{{ category.name }} commands: - {{ utr_install_nix }} - ./utr --suite=playmode {% if category.name == "performance" %} --category=Performance {% endif %} --platform=iOS --player-load-path=build/players --artifacts_path=build/test-results --report-performance-data --performance-project-id=InputSystem @@ -186,7 +186,7 @@ run_android_{{ editor.version }}_{{ backend.name }}_{{ category.name }}: skip_checkout: true # Set a dependency on the build job dependencies: - - .yamato/upm-ci.yml#build_android_{{ editor.version }}_{{ backend.name }} + - .yamato/upm-ci.yml#build_android_{{ editor.version }}_{{ backend.name }}_{{ category.name }} commands: - {{ utr_install_win }} - | From 4090e9c821a96d801da06a6fb439c97383cf7d8b Mon Sep 17 00:00:00 2001 From: Stefan Schubert Date: Fri, 30 Aug 2024 17:58:26 +0200 Subject: [PATCH 22/34] fix All Test job --- .yamato/upm-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.yamato/upm-ci.yml b/.yamato/upm-ci.yml index e8354d1b30..853a407177 100644 --- a/.yamato/upm-ci.yml +++ b/.yamato/upm-ci.yml @@ -216,15 +216,15 @@ all_tests: dependencies: {% for editor in editors %} {% for platform in platforms_win %} - - .yamato/upm-ci.yml#{{ platform.name }}_{{ editor.version }} + - .yamato/upm-ci.yml#{{ platform.name }}_{{ editor.version }}_all {% endfor %} {% for platform in platforms_nix %} - - .yamato/upm-ci.yml#{{ platform.name }}_{{ editor.version }} + - .yamato/upm-ci.yml#{{ platform.name }}_{{ editor.version }}_all {% endfor %} {% for backend in scripting_backends %} - - .yamato/upm-ci.yml#run_android_{{ editor.version }}_{{ backend.name }} + - .yamato/upm-ci.yml#run_android_{{ editor.version }}_{{ backend.name }}_all {% endfor %} - - .yamato/upm-ci.yml#run_ios_{{ editor.version }} + - .yamato/upm-ci.yml#run_ios_{{ editor.version }}_all {% if editor.disable_tvos_run %} - .yamato/upm-ci.yml#build_tvos_{{ editor.version }} {% else %} From f707d6a89210ca7eef110e744da7300511075a72 Mon Sep 17 00:00:00 2001 From: Stefan Schubert Date: Mon, 2 Sep 2024 19:16:54 +0200 Subject: [PATCH 23/34] daily run test --- .yamato/upm-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.yamato/upm-ci.yml b/.yamato/upm-ci.yml index 853a407177..b01ed99fb1 100644 --- a/.yamato/upm-ci.yml +++ b/.yamato/upm-ci.yml @@ -257,7 +257,7 @@ performance_tests_only: {% endfor %} triggers: recurring: - - branch: develop + - branch: input/performance-testing-changes frequency: daily rerun: always From 8950a1efefdec909e628ea5841485c560630f340 Mon Sep 17 00:00:00 2001 From: Stefan Schubert Date: Mon, 2 Sep 2024 19:17:11 +0200 Subject: [PATCH 24/34] shorter names for yamato --- .yamato/upm-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.yamato/upm-ci.yml b/.yamato/upm-ci.yml index b01ed99fb1..b1f093e624 100644 --- a/.yamato/upm-ci.yml +++ b/.yamato/upm-ci.yml @@ -5,7 +5,7 @@ {% for platform in platforms_win %} {% for category in test_category %} {{ platform.name }}_{{ editor.version }}_{{ category.name }}: - name : Build and Test version {{ editor.version }} on {{ platform.name }}, {{ category.name }} tests + name : Build & Test {{ editor.version }} on {{ platform.name }}, {{ category.name }} tests agent: type: {{ platform.type }} image: {{ platform.image }} @@ -43,7 +43,7 @@ {% for platform in platforms_nix %} {% for category in test_category %} {{ platform.name }}_{{ editor.version }}_{{ category.name }}: - name : Build and Test version {{ editor.version }} on {{ platform.name }}, {{ category.name }} tests + name : Build & Test {{ editor.version }} on {{ platform.name }}, {{ category.name }} tests agent: type: {{ platform.type }} image: {{ platform.image }} From d9c98d26e831e2914bd8ac07e9943b6a421602a4 Mon Sep 17 00:00:00 2001 From: Stefan Schubert Date: Tue, 3 Sep 2024 13:26:28 +0200 Subject: [PATCH 25/34] update package to latest, increase performance runs --- .../Tests/InputSystem/CorePerformanceTests.cs | 122 +++++++++--------- Packages/manifest.json | 2 +- 2 files changed, 62 insertions(+), 62 deletions(-) diff --git a/Assets/Tests/InputSystem/CorePerformanceTests.cs b/Assets/Tests/InputSystem/CorePerformanceTests.cs index e5480672bd..277063e1f4 100644 --- a/Assets/Tests/InputSystem/CorePerformanceTests.cs +++ b/Assets/Tests/InputSystem/CorePerformanceTests.cs @@ -31,7 +31,7 @@ public override void Setup() NativeLeakDetection.Mode = NativeLeakDetectionMode.Disabled; } - [Test, Performance] + [Test, Performance, Version("2")] [Category("Performance")] public void Performance_MakeCircles() { @@ -39,13 +39,13 @@ public void Performance_MakeCircles() { SpriteUtilities.CreateCircleSprite(16, new Color32(255, 255, 255, 255)); }) - .MeasurementCount(100) + .MeasurementCount(10000) .WarmupCount(5) .Run(); } ////TODO: same test but with several actions listening on each gamepad - [Test, Performance] + [Test, Performance, Version("2")] [Category("Performance")] public void Performance_Update10Gamepads() { @@ -61,12 +61,12 @@ public void Performance_Update10Gamepads() InputSystem.QueueStateEvent(gamepads[i], default(GamepadState)); InputSystem.Update(); }) - .MeasurementCount(100) + .MeasurementCount(10000) .WarmupCount(5) .Run(); } - [Test, Performance] + [Test, Performance, Version("2")] [Category("Performance")] public void Performance_UpdateMouse100TimesInFrame() { @@ -78,12 +78,12 @@ public void Performance_UpdateMouse100TimesInFrame() InputSystem.QueueStateEvent(mouse, default(MouseState)); InputSystem.Update(); }) - .MeasurementCount(100) + .MeasurementCount(10000) .WarmupCount(5) .Run(); } - [Test, Performance] + [Test, Performance, Version("2")] [Category("Performance")] [TestCase(true)] [TestCase(false)] @@ -109,12 +109,12 @@ public void Performance_TwoTouchesOverThreeFrames(bool enableEnhancedTouch) EndTouch(2, new Vector2(111, 222), queueEventOnly: true); InputSystem.Update(); }) - .MeasurementCount(100) + .MeasurementCount(10000) .WarmupCount(5) .Run(); } - [Test, Performance] + [Test, Performance, Version("2")] [Category("Performance")] public void Performance_ReadEveryKey() { @@ -125,12 +125,12 @@ public void Performance_ReadEveryKey() foreach (var key in keyboard.allKeys) key.ReadValue(); }) - .MeasurementCount(100) + .MeasurementCount(2000) .WarmupCount(5) .Run(); } - [Test, Performance] + [Test, Performance, Version("2")] [Category("Performance")] [TestCase("Gamepad", "leftStick")] [TestCase("Gamepad", "buttonSouth")] @@ -149,12 +149,12 @@ public void Performance_ReadControl(string deviceLayout, string controlPath) throw new NotImplementedException(); Measure.Method(method) - .MeasurementCount(200) + .MeasurementCount(20000) .WarmupCount(5) .Run(); } - [Test, Performance] + [Test, Performance, Version("2")] [Category("Performance")] [TestCase("Mouse")] [TestCase("Touchscreen")] @@ -166,12 +166,12 @@ public void Performance_CreateDevice(string layoutName) InputControlLayout.s_Layouts.precompiledLayouts.Clear(); Measure.Method(() => InputDevice.Build(layoutName)) - .MeasurementCount(100) + .MeasurementCount(10000) .WarmupCount(5) .Run(); } - [Test, Performance] + [Test, Performance, Version("2")] [Category("Performance")] // Layouts tested here must have precompiled versions for this test to be meaningful. [TestCase("Mouse")] @@ -180,12 +180,12 @@ public void Performance_CreateDevice(string layoutName) public void Performance_CreatePrecompiledDevice(string layoutName) { Measure.Method(() => InputDevice.Build(layoutName)) - .MeasurementCount(100) + .MeasurementCount(10000) .WarmupCount(5) .Run(); } - [Test, Performance] + [Test, Performance, Version("2")] [Category("Performance")] public void Performance_TriggerAction() { @@ -194,12 +194,12 @@ public void Performance_TriggerAction() action.Enable(); Measure.Method(() => PressAndRelease(gamepad.buttonSouth)) - .MeasurementCount(100) + .MeasurementCount(10000) .WarmupCount(5) .Run(); } - [Test, Performance] + [Test, Performance, Version("2")] [Category("Performance")] public void Performance_ReadActionValue_InCallback() { @@ -210,12 +210,12 @@ public void Performance_ReadActionValue_InCallback() action.performed += ctx => ctx.ReadValue(); Measure.Method(() => PressAndRelease(gamepad.buttonSouth)) - .MeasurementCount(100) + .MeasurementCount(10000) .WarmupCount(5) .Run(); } - [Test, Performance] + [Test, Performance, Version("2")] [Category("Performance")] public void Performance_ReadActionValue() { @@ -226,12 +226,12 @@ public void Performance_ReadActionValue() Press(gamepad.buttonSouth); Measure.Method(() => action.ReadValue()) - .MeasurementCount(100) + .MeasurementCount(10000) .WarmupCount(5) .Run(); } - [Test, Performance] + [Test, Performance, Version("2")] [Category("Performance")] public void Performance_ListenForUnpairedDeviceActivity() { @@ -246,12 +246,12 @@ public void Performance_ListenForUnpairedDeviceActivity() BeginTouch(1, new Vector2(123, 234)); EndTouch(1, new Vector2(234, 345)); }) - .MeasurementCount(100) + .MeasurementCount(10000) .WarmupCount(5) .Run(); } - [Test, Performance] + [Test, Performance, Version("2")] [Category("Performance")] public unsafe void Performance_SearchForChangedButtonInEvent_Manually() { @@ -293,7 +293,7 @@ public unsafe void Performance_SearchForChangedButtonInEvent_Manually() } } - [Test, Performance] + [Test, Performance, Version("2")] [Category("Performance")] public void Performance_SearchForChangedButtonInEvent_UsingEnumerateChangedControls() { @@ -321,7 +321,7 @@ public void Performance_SearchForChangedButtonInEvent_UsingEnumerateChangedContr } Assert.That(foundIt, Is.True); }) - .MeasurementCount(500) + .MeasurementCount(50000) .WarmupCount(5) .Run(); } @@ -331,7 +331,7 @@ public void Performance_SearchForChangedButtonInEvent_UsingEnumerateChangedContr // to monitor all incoming input events and figure out whether they are or are not leading // to a control scheme change. The performance impact of this must be as low as we can // get it. - [Test, Performance] + [Test, Performance, Version("2")] [Category("Performance")] public void Performance_AutoSwitchingOfControlSchemesInPlayerInput_UnrelatedDeviceIsFeedingInput() { @@ -361,12 +361,12 @@ public void Performance_AutoSwitchingOfControlSchemesInPlayerInput_UnrelatedDevi InputSystem.QueueStateEvent(mouse, new MouseState { position = new Vector2(678, 789)}); InputSystem.Update(); }) - .MeasurementCount(500) + .MeasurementCount(50000) .WarmupCount(5) .Run(); } - [Test, Performance] + [Test, Performance, Version("2")] [Category("Performance")] public void Performance_AutoSwitchingOfControlSchemesInPlayerInput_SwitchBackAndForth() { @@ -399,12 +399,12 @@ public void Performance_AutoSwitchingOfControlSchemesInPlayerInput_SwitchBackAnd PressAndRelease(gamepad.buttonSouth); PressAndRelease(keyboard.spaceKey); }) - .MeasurementCount(500) + .MeasurementCount(50000) .WarmupCount(5) .Run(); } - [Test, Performance] + [Test, Performance, Version("2")] [Category("Performance")] public void Performance_Rebinding_OneSuccessfulCycle() { @@ -421,7 +421,7 @@ public void Performance_Rebinding_OneSuccessfulCycle() Assert.That(action.controls[0], Is.SameAs(gamepad.buttonNorth)); } }) - .MeasurementCount(100) + .MeasurementCount(10000) .WarmupCount(5) .Run(); } @@ -432,7 +432,7 @@ public enum LookupByName CaseDoesNotMatch } - [Test, Performance] + [Test, Performance, Version("2")] [Category("Performance")] [TestCase(LookupByName.CaseMatches)] [TestCase(LookupByName.CaseDoesNotMatch)] @@ -449,12 +449,12 @@ public void Performance_LookupActionByName(LookupByName lookup) { var _ = asset[(lookup == LookupByName.CaseDoesNotMatch ? "ACTION" : "action") + (int)(kActionCount * 0.75f)]; }) - .MeasurementCount(100) + .MeasurementCount(10000) .WarmupCount(5) .Run(); } - [Test, Performance] + [Test, Performance, Version("2")] [Category("Performance")] public void Performance_LookupActionByGuid() { @@ -477,13 +477,13 @@ public void Performance_LookupActionByGuid() { Assert.That(asset[actionToFind.id.ToString()], Is.SameAs(actionToFind)); }) - .MeasurementCount(100) + .MeasurementCount(10000) .WarmupCount(5) .Run(); } // We're hitting MatchesPrefix a lot from rebinding, so make sure it's performing reasonably well. - [Test, Performance] + [Test, Performance, Version("2")] [Category("Performance")] public void Performance_MatchControlPathPrefix() { @@ -501,12 +501,12 @@ public void Performance_MatchControlPathPrefix() Assert.That(result3, Is.True); Assert.That(result4, Is.False); }) - .MeasurementCount(100) + .MeasurementCount(10000) .WarmupCount(5) .Run(); } - [Test, Performance] + [Test, Performance, Version("2")] [Category("Performance")] [TestCase("Gamepad")] [TestCase("Touchscreen")] @@ -532,7 +532,7 @@ public void Performance_FindControlScheme(string device1, string device2 = null, match.Dispose(); Assert.That(result, Is.EqualTo(success)); }) - .MeasurementCount(100) + .MeasurementCount(10000) .WarmupCount(5) .Run(); } @@ -568,7 +568,7 @@ public void SetInternalFeatureFlagsFromTestType(OptimizationTestType testType) InputSystem.settings.SetInternalFeatureFlag(InputFeatureNames.kParanoidReadValueCachingChecks, false); } - [Test, Performance] + [Test, Performance, Version("2")] [Category("Performance")] [TestCase(OptimizationTestType.NoOptimization)] [TestCase(OptimizationTestType.OptimizedControls)] @@ -593,12 +593,12 @@ public void Performance_OptimizedControls_ReadingMousePosition100kTimes(Optimiza for (var i = 0; i < 100000; ++i) pos += mouse.position.ReadValue(); }) - .MeasurementCount(100) + .MeasurementCount(10000) .WarmupCount(5) .Run(); } - [Test, Performance] + [Test, Performance, Version("2")] [Category("Performance")] [TestCase(OptimizationTestType.NoOptimization)] [TestCase(OptimizationTestType.OptimizedControls)] @@ -636,12 +636,12 @@ public void Performance_OptimizedControls_ReadAndUpdateMousePosition1kTimes(Opti } } }) - .MeasurementCount(100) + .MeasurementCount(10000) .WarmupCount(5) .Run(); } - [Test, Performance] + [Test, Performance, Version("2")] [Category("Performance")] [TestCase(OptimizationTestType.NoOptimization)] [TestCase(OptimizationTestType.ReadValueCaching)] @@ -679,12 +679,12 @@ public void Performance_OptimizedControls_ReadAndUpdateGamepad1kTimes(Optimizati } } }) - .MeasurementCount(100) + .MeasurementCount(10000) .WarmupCount(10) .Run(); } - [Test, Performance] + [Test, Performance, Version("2")] [Category("Performance")] [TestCase(OptimizationTestType.NoOptimization)] [TestCase(OptimizationTestType.ReadValueCaching)] @@ -716,7 +716,7 @@ public void Performance_OptimizedControls_ReadAndUpdateGamepadNewValuesEveryFram InputSystem.QueueStateEvent(gamepad, new GamepadState { leftStick = new Vector2(i / 1000f, i / 1000f) }); } }) - .MeasurementCount(100) + .MeasurementCount(10000) .WarmupCount(10) .Run(); } @@ -762,7 +762,7 @@ public void Performance_OptimizedControls_ReadAndUpdateKeyboard1kTimes(Optimizat } } }) - .MeasurementCount(100) + .MeasurementCount(10000) .WarmupCount(10) .Run(); } @@ -804,12 +804,12 @@ public void Performance_OptimizedControls_ReadAndUpdateKeyboardNewValuesEveryFra InputSystem.QueueStateEvent(keyboard, new KeyboardState(Key.F)); } }) - .MeasurementCount(100) + .MeasurementCount(10000) .WarmupCount(10) .Run(); } - [Test, Performance] + [Test, Performance, Version("2")] [Category("Performance")] [TestCase(OptimizationTestType.NoOptimization)] [TestCase(OptimizationTestType.OptimizedControls)] @@ -830,7 +830,7 @@ public void Performance_OptimizedControls_UpdateOnly1kTimes(OptimizationTestType { CallUpdate(); }) - .MeasurementCount(100) + .MeasurementCount(10000) .SampleGroup("Mouse Only") .WarmupCount(10) .Run(); @@ -843,7 +843,7 @@ public void Performance_OptimizedControls_UpdateOnly1kTimes(OptimizationTestType { CallUpdate(); }) - .MeasurementCount(100) + .MeasurementCount(10000) .SampleGroup("Gamepad Only") .WarmupCount(10) .Run(); @@ -906,7 +906,7 @@ public void Performance_OptimizedControls_Gamepad_250PressAndUpdate_WasPressedTh { CallUpdate(); }) - .MeasurementCount(100) + .MeasurementCount(10000) .SampleGroup("Gamepad Only") .WarmupCount(10) .Run(); @@ -969,7 +969,7 @@ public void Performance_OptimizedControls_Keyboard_250PressAndUpdate_WasPressedT { CallUpdate(); }) - .MeasurementCount(100) + .MeasurementCount(10000) .SampleGroup("Keyboard Only") .WarmupCount(10) .Run(); @@ -982,7 +982,7 @@ void CallUpdate() } } - [Test, Performance] + [Test, Performance, Version("2")] [Category("Performance")] [TestCase(OptimizationTestType.NoOptimization)] [TestCase(OptimizationTestType.ReadValueCaching)] @@ -1005,7 +1005,7 @@ public void Performance_OptimizedControls_EvaluateStaleControlReadsWhenGamepadSt { MethodToMeasure(gamepad); }).SampleGroup("ReadValueCaching Expected With WORSE Performance") - .MeasurementCount(100) + .MeasurementCount(10000) .WarmupCount(5) .Run(); @@ -1033,7 +1033,7 @@ public void Performance_OptimizedControls_EvaluateStaleControlReadsWhenGamepadSt { MethodToMeasure(gamepad); }).SampleGroup("ReadValueCaching Expected With BETTER Performance") - .MeasurementCount(100) + .MeasurementCount(10000) .WarmupCount(5) .Run(); @@ -1066,7 +1066,7 @@ void MethodToMeasure(Gamepad g) } #if ENABLE_VR - [Test, Performance] + [Test, Performance, Version("2")] [Category("Performance")] [TestCase(OptimizationTestType.NoOptimization)] [TestCase(OptimizationTestType.OptimizedControls)] @@ -1094,7 +1094,7 @@ public void Performance_OptimizedControls_ReadingPose4kTimes(OptimizationTestTyp for (var i = 0; i < 4000; ++i) poseControl.ReadValue(); }) - .MeasurementCount(100) + .MeasurementCount(10000) .WarmupCount(5) .Run(); } diff --git a/Packages/manifest.json b/Packages/manifest.json index e30ea7e0e9..e2741468f9 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -8,7 +8,7 @@ "com.unity.settings-manager": "1.0.3", "com.unity.test-framework": "1.4.3", "com.unity.test-framework.build": "0.0.1-preview.12", - "com.unity.test-framework.performance": "3.0.2", + "com.unity.test-framework.performance": "3.0.3", "com.unity.test-framework.utp-reporter": "1.1.0-preview", "com.unity.textmeshpro": "2.1.4", "com.unity.ugui": "1.0.0", From 95d3eec4fff2428672e4214630ee1c8d3605429a Mon Sep 17 00:00:00 2001 From: Stefan Schubert Date: Tue, 3 Sep 2024 13:42:18 +0200 Subject: [PATCH 26/34] Update upm-ci.yml --- .yamato/upm-ci.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.yamato/upm-ci.yml b/.yamato/upm-ci.yml index b1f093e624..6718dbbd64 100644 --- a/.yamato/upm-ci.yml +++ b/.yamato/upm-ci.yml @@ -5,7 +5,7 @@ {% for platform in platforms_win %} {% for category in test_category %} {{ platform.name }}_{{ editor.version }}_{{ category.name }}: - name : Build & Test {{ editor.version }} on {{ platform.name }}, {{ category.name }} tests + name : Build & Test {{ editor.version }} - {{ platform.name }}, {{ category.name }} tests agent: type: {{ platform.type }} image: {{ platform.image }} @@ -43,7 +43,7 @@ {% for platform in platforms_nix %} {% for category in test_category %} {{ platform.name }}_{{ editor.version }}_{{ category.name }}: - name : Build & Test {{ editor.version }} on {{ platform.name }}, {{ category.name }} tests + name : Build & Test {{ editor.version }} - {{ platform.name }}, {{ category.name }} tests agent: type: {{ platform.type }} image: {{ platform.image }} @@ -82,7 +82,7 @@ {% for editor in editors %} {% for category in test_category %} build_ios_{{ editor.version }}_{{ category.name }}: - name: Build Tests on {{ editor.version }} on ios, {{ category.name }} tests + name: Build Tests - {{ editor.version }} - iOS, {{ category.name }} tests agent: type: Unity::VM::osx image: {{ ios_and_tvos_macos_bokken_image }} @@ -101,7 +101,7 @@ build_ios_{{ editor.version }}_{{ category.name }}: - "build/logs/**" run_ios_{{ editor.version }}_{{ category.name }}: - name: Run Tests on {{ editor.version }} on ios, {{ category.name }} tests + name: Run Tests - {{ editor.version }} - iOS, {{ category.name }} tests agent: type: Unity::mobile::iPhone image: {{ ios_and_tvos_macos_bokken_image }} @@ -120,7 +120,7 @@ run_ios_{{ editor.version }}_{{ category.name }}: {% endfor %} #category build_tvos_{{ editor.version }}: - name: Build Tests on {{ editor.version }} on tvos + name: Build Tests - {{ editor.version }} - tvOS agent: type: Unity::VM::osx image: {{ ios_and_tvos_macos_bokken_image }} @@ -139,7 +139,7 @@ build_tvos_{{ editor.version }}: - "build/logs/**" run_tvos_{{ editor.version }}: - name: Run Tests on {{ editor.version }} on tvos + name: Run Tests - {{ editor.version }} - tvOS agent: type: Unity::mobile::appletv image: {{ ios_and_tvos_macos_bokken_image }} @@ -158,7 +158,7 @@ run_tvos_{{ editor.version }}: {% for backend in scripting_backends %} {% for category in test_category %} build_android_{{ editor.version }}_{{ backend.name }}_{{ category.name }}: - name: Build Tests on {{ editor.version }} on android {{ backend.name }}, {{ category.name }} tests + name: Build Tests - {{ editor.version }} - Android {{ backend.name }}, {{ category.name }} tests agent: type: Unity::VM image: package-ci/win10:default @@ -177,7 +177,7 @@ build_android_{{ editor.version }}_{{ backend.name }}_{{ category.name }}: - "build/logs/**" run_android_{{ editor.version }}_{{ backend.name }}_{{ category.name }}: - name: Run Tests on {{ editor.version }} on android {{ backend.name }}, {{ category.name }} tests + name: Run Tests - {{ editor.version }} - Android {{ backend.name }}, {{ category.name }} tests agent: type: Unity::mobile::shield image: package-ci/win10:default From ec6d4e0d5e96996cdbf69e3c3d0ae9a38329ffdc Mon Sep 17 00:00:00 2001 From: Stefan Schubert Date: Tue, 3 Sep 2024 14:13:17 +0200 Subject: [PATCH 27/34] lowering some runs again --- .yamato/upm-ci.yml | 2 +- .../Tests/InputSystem/CorePerformanceTests.cs | 26 +++++++++---------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.yamato/upm-ci.yml b/.yamato/upm-ci.yml index 6718dbbd64..dbdd0ccc94 100644 --- a/.yamato/upm-ci.yml +++ b/.yamato/upm-ci.yml @@ -259,7 +259,7 @@ performance_tests_only: recurring: - branch: input/performance-testing-changes frequency: daily - rerun: always + rerun: on_new_revision {% for run in (1..2) %} publish{% cycle "", "_dryrun" %}: diff --git a/Assets/Tests/InputSystem/CorePerformanceTests.cs b/Assets/Tests/InputSystem/CorePerformanceTests.cs index 277063e1f4..bb1f0ef043 100644 --- a/Assets/Tests/InputSystem/CorePerformanceTests.cs +++ b/Assets/Tests/InputSystem/CorePerformanceTests.cs @@ -166,7 +166,7 @@ public void Performance_CreateDevice(string layoutName) InputControlLayout.s_Layouts.precompiledLayouts.Clear(); Measure.Method(() => InputDevice.Build(layoutName)) - .MeasurementCount(10000) + .MeasurementCount(1000) .WarmupCount(5) .Run(); } @@ -593,7 +593,7 @@ public void Performance_OptimizedControls_ReadingMousePosition100kTimes(Optimiza for (var i = 0; i < 100000; ++i) pos += mouse.position.ReadValue(); }) - .MeasurementCount(10000) + .MeasurementCount(1000) .WarmupCount(5) .Run(); } @@ -636,7 +636,7 @@ public void Performance_OptimizedControls_ReadAndUpdateMousePosition1kTimes(Opti } } }) - .MeasurementCount(10000) + .MeasurementCount(1000) .WarmupCount(5) .Run(); } @@ -679,7 +679,7 @@ public void Performance_OptimizedControls_ReadAndUpdateGamepad1kTimes(Optimizati } } }) - .MeasurementCount(10000) + .MeasurementCount(1000) .WarmupCount(10) .Run(); } @@ -716,7 +716,7 @@ public void Performance_OptimizedControls_ReadAndUpdateGamepadNewValuesEveryFram InputSystem.QueueStateEvent(gamepad, new GamepadState { leftStick = new Vector2(i / 1000f, i / 1000f) }); } }) - .MeasurementCount(10000) + .MeasurementCount(1000) .WarmupCount(10) .Run(); } @@ -762,7 +762,7 @@ public void Performance_OptimizedControls_ReadAndUpdateKeyboard1kTimes(Optimizat } } }) - .MeasurementCount(10000) + .MeasurementCount(1000) .WarmupCount(10) .Run(); } @@ -804,7 +804,7 @@ public void Performance_OptimizedControls_ReadAndUpdateKeyboardNewValuesEveryFra InputSystem.QueueStateEvent(keyboard, new KeyboardState(Key.F)); } }) - .MeasurementCount(10000) + .MeasurementCount(1000) .WarmupCount(10) .Run(); } @@ -830,7 +830,7 @@ public void Performance_OptimizedControls_UpdateOnly1kTimes(OptimizationTestType { CallUpdate(); }) - .MeasurementCount(10000) + .MeasurementCount(1000) .SampleGroup("Mouse Only") .WarmupCount(10) .Run(); @@ -843,7 +843,7 @@ public void Performance_OptimizedControls_UpdateOnly1kTimes(OptimizationTestType { CallUpdate(); }) - .MeasurementCount(10000) + .MeasurementCount(1000) .SampleGroup("Gamepad Only") .WarmupCount(10) .Run(); @@ -906,7 +906,7 @@ public void Performance_OptimizedControls_Gamepad_250PressAndUpdate_WasPressedTh { CallUpdate(); }) - .MeasurementCount(10000) + .MeasurementCount(1000) .SampleGroup("Gamepad Only") .WarmupCount(10) .Run(); @@ -969,7 +969,7 @@ public void Performance_OptimizedControls_Keyboard_250PressAndUpdate_WasPressedT { CallUpdate(); }) - .MeasurementCount(10000) + .MeasurementCount(1000) .SampleGroup("Keyboard Only") .WarmupCount(10) .Run(); @@ -1005,7 +1005,7 @@ public void Performance_OptimizedControls_EvaluateStaleControlReadsWhenGamepadSt { MethodToMeasure(gamepad); }).SampleGroup("ReadValueCaching Expected With WORSE Performance") - .MeasurementCount(10000) + .MeasurementCount(1000) .WarmupCount(5) .Run(); @@ -1094,7 +1094,7 @@ public void Performance_OptimizedControls_ReadingPose4kTimes(OptimizationTestTyp for (var i = 0; i < 4000; ++i) poseControl.ReadValue(); }) - .MeasurementCount(10000) + .MeasurementCount(1000) .WarmupCount(5) .Run(); } From c18c692c92c4f5895c8cb5e8a9a385d35fa3288a Mon Sep 17 00:00:00 2001 From: Stefan Schubert Date: Tue, 3 Sep 2024 15:54:01 +0200 Subject: [PATCH 28/34] more lowering --- Assets/Tests/InputSystem/CorePerformanceTests.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Assets/Tests/InputSystem/CorePerformanceTests.cs b/Assets/Tests/InputSystem/CorePerformanceTests.cs index bb1f0ef043..fb530c2c04 100644 --- a/Assets/Tests/InputSystem/CorePerformanceTests.cs +++ b/Assets/Tests/InputSystem/CorePerformanceTests.cs @@ -166,7 +166,7 @@ public void Performance_CreateDevice(string layoutName) InputControlLayout.s_Layouts.precompiledLayouts.Clear(); Measure.Method(() => InputDevice.Build(layoutName)) - .MeasurementCount(1000) + .MeasurementCount(100) .WarmupCount(5) .Run(); } @@ -399,7 +399,7 @@ public void Performance_AutoSwitchingOfControlSchemesInPlayerInput_SwitchBackAnd PressAndRelease(gamepad.buttonSouth); PressAndRelease(keyboard.spaceKey); }) - .MeasurementCount(50000) + .MeasurementCount(5000) .WarmupCount(5) .Run(); } @@ -1005,7 +1005,7 @@ public void Performance_OptimizedControls_EvaluateStaleControlReadsWhenGamepadSt { MethodToMeasure(gamepad); }).SampleGroup("ReadValueCaching Expected With WORSE Performance") - .MeasurementCount(1000) + .MeasurementCount(100) .WarmupCount(5) .Run(); @@ -1033,7 +1033,7 @@ public void Performance_OptimizedControls_EvaluateStaleControlReadsWhenGamepadSt { MethodToMeasure(gamepad); }).SampleGroup("ReadValueCaching Expected With BETTER Performance") - .MeasurementCount(10000) + .MeasurementCount(100) .WarmupCount(5) .Run(); @@ -1094,7 +1094,7 @@ public void Performance_OptimizedControls_ReadingPose4kTimes(OptimizationTestTyp for (var i = 0; i < 4000; ++i) poseControl.ReadValue(); }) - .MeasurementCount(1000) + .MeasurementCount(100) .WarmupCount(5) .Run(); } From 34dc09fbf5ed89b8a92d41cc0f191ba678a3820c Mon Sep 17 00:00:00 2001 From: Stefan Schubert Date: Tue, 3 Sep 2024 17:32:51 +0200 Subject: [PATCH 29/34] back to 0 and reevalute --- .../Tests/InputSystem/CorePerformanceTests.cs | 116 +++++++++--------- 1 file changed, 58 insertions(+), 58 deletions(-) diff --git a/Assets/Tests/InputSystem/CorePerformanceTests.cs b/Assets/Tests/InputSystem/CorePerformanceTests.cs index fb530c2c04..3c641239a5 100644 --- a/Assets/Tests/InputSystem/CorePerformanceTests.cs +++ b/Assets/Tests/InputSystem/CorePerformanceTests.cs @@ -31,7 +31,7 @@ public override void Setup() NativeLeakDetection.Mode = NativeLeakDetectionMode.Disabled; } - [Test, Performance, Version("2")] + [Test, Performance] [Category("Performance")] public void Performance_MakeCircles() { @@ -39,13 +39,13 @@ public void Performance_MakeCircles() { SpriteUtilities.CreateCircleSprite(16, new Color32(255, 255, 255, 255)); }) - .MeasurementCount(10000) + .MeasurementCount(100) .WarmupCount(5) .Run(); } ////TODO: same test but with several actions listening on each gamepad - [Test, Performance, Version("2")] + [Test, Performance] [Category("Performance")] public void Performance_Update10Gamepads() { @@ -61,12 +61,12 @@ public void Performance_Update10Gamepads() InputSystem.QueueStateEvent(gamepads[i], default(GamepadState)); InputSystem.Update(); }) - .MeasurementCount(10000) + .MeasurementCount(100) .WarmupCount(5) .Run(); } - [Test, Performance, Version("2")] + [Test, Performance] [Category("Performance")] public void Performance_UpdateMouse100TimesInFrame() { @@ -78,12 +78,12 @@ public void Performance_UpdateMouse100TimesInFrame() InputSystem.QueueStateEvent(mouse, default(MouseState)); InputSystem.Update(); }) - .MeasurementCount(10000) + .MeasurementCount(100) .WarmupCount(5) .Run(); } - [Test, Performance, Version("2")] + [Test, Performance] [Category("Performance")] [TestCase(true)] [TestCase(false)] @@ -109,12 +109,12 @@ public void Performance_TwoTouchesOverThreeFrames(bool enableEnhancedTouch) EndTouch(2, new Vector2(111, 222), queueEventOnly: true); InputSystem.Update(); }) - .MeasurementCount(10000) + .MeasurementCount(100) .WarmupCount(5) .Run(); } - [Test, Performance, Version("2")] + [Test, Performance] [Category("Performance")] public void Performance_ReadEveryKey() { @@ -125,12 +125,12 @@ public void Performance_ReadEveryKey() foreach (var key in keyboard.allKeys) key.ReadValue(); }) - .MeasurementCount(2000) + .MeasurementCount(100) .WarmupCount(5) .Run(); } - [Test, Performance, Version("2")] + [Test, Performance] [Category("Performance")] [TestCase("Gamepad", "leftStick")] [TestCase("Gamepad", "buttonSouth")] @@ -149,12 +149,12 @@ public void Performance_ReadControl(string deviceLayout, string controlPath) throw new NotImplementedException(); Measure.Method(method) - .MeasurementCount(20000) + .MeasurementCount(200) .WarmupCount(5) .Run(); } - [Test, Performance, Version("2")] + [Test, Performance] [Category("Performance")] [TestCase("Mouse")] [TestCase("Touchscreen")] @@ -171,7 +171,7 @@ public void Performance_CreateDevice(string layoutName) .Run(); } - [Test, Performance, Version("2")] + [Test, Performance] [Category("Performance")] // Layouts tested here must have precompiled versions for this test to be meaningful. [TestCase("Mouse")] @@ -180,12 +180,12 @@ public void Performance_CreateDevice(string layoutName) public void Performance_CreatePrecompiledDevice(string layoutName) { Measure.Method(() => InputDevice.Build(layoutName)) - .MeasurementCount(10000) + .MeasurementCount(100) .WarmupCount(5) .Run(); } - [Test, Performance, Version("2")] + [Test, Performance] [Category("Performance")] public void Performance_TriggerAction() { @@ -194,12 +194,12 @@ public void Performance_TriggerAction() action.Enable(); Measure.Method(() => PressAndRelease(gamepad.buttonSouth)) - .MeasurementCount(10000) + .MeasurementCount(100) .WarmupCount(5) .Run(); } - [Test, Performance, Version("2")] + [Test, Performance] [Category("Performance")] public void Performance_ReadActionValue_InCallback() { @@ -210,12 +210,12 @@ public void Performance_ReadActionValue_InCallback() action.performed += ctx => ctx.ReadValue(); Measure.Method(() => PressAndRelease(gamepad.buttonSouth)) - .MeasurementCount(10000) + .MeasurementCount(100) .WarmupCount(5) .Run(); } - [Test, Performance, Version("2")] + [Test, Performance] [Category("Performance")] public void Performance_ReadActionValue() { @@ -226,12 +226,12 @@ public void Performance_ReadActionValue() Press(gamepad.buttonSouth); Measure.Method(() => action.ReadValue()) - .MeasurementCount(10000) + .MeasurementCount(100) .WarmupCount(5) .Run(); } - [Test, Performance, Version("2")] + [Test, Performance] [Category("Performance")] public void Performance_ListenForUnpairedDeviceActivity() { @@ -246,12 +246,12 @@ public void Performance_ListenForUnpairedDeviceActivity() BeginTouch(1, new Vector2(123, 234)); EndTouch(1, new Vector2(234, 345)); }) - .MeasurementCount(10000) + .MeasurementCount(100) .WarmupCount(5) .Run(); } - [Test, Performance, Version("2")] + [Test, Performance] [Category("Performance")] public unsafe void Performance_SearchForChangedButtonInEvent_Manually() { @@ -293,7 +293,7 @@ public unsafe void Performance_SearchForChangedButtonInEvent_Manually() } } - [Test, Performance, Version("2")] + [Test, Performance] [Category("Performance")] public void Performance_SearchForChangedButtonInEvent_UsingEnumerateChangedControls() { @@ -321,7 +321,7 @@ public void Performance_SearchForChangedButtonInEvent_UsingEnumerateChangedContr } Assert.That(foundIt, Is.True); }) - .MeasurementCount(50000) + .MeasurementCount(500) .WarmupCount(5) .Run(); } @@ -331,7 +331,7 @@ public void Performance_SearchForChangedButtonInEvent_UsingEnumerateChangedContr // to monitor all incoming input events and figure out whether they are or are not leading // to a control scheme change. The performance impact of this must be as low as we can // get it. - [Test, Performance, Version("2")] + [Test, Performance] [Category("Performance")] public void Performance_AutoSwitchingOfControlSchemesInPlayerInput_UnrelatedDeviceIsFeedingInput() { @@ -361,12 +361,12 @@ public void Performance_AutoSwitchingOfControlSchemesInPlayerInput_UnrelatedDevi InputSystem.QueueStateEvent(mouse, new MouseState { position = new Vector2(678, 789)}); InputSystem.Update(); }) - .MeasurementCount(50000) + .MeasurementCount(500) .WarmupCount(5) .Run(); } - [Test, Performance, Version("2")] + [Test, Performance] [Category("Performance")] public void Performance_AutoSwitchingOfControlSchemesInPlayerInput_SwitchBackAndForth() { @@ -399,12 +399,12 @@ public void Performance_AutoSwitchingOfControlSchemesInPlayerInput_SwitchBackAnd PressAndRelease(gamepad.buttonSouth); PressAndRelease(keyboard.spaceKey); }) - .MeasurementCount(5000) + .MeasurementCount(500) .WarmupCount(5) .Run(); } - [Test, Performance, Version("2")] + [Test, Performance] [Category("Performance")] public void Performance_Rebinding_OneSuccessfulCycle() { @@ -421,7 +421,7 @@ public void Performance_Rebinding_OneSuccessfulCycle() Assert.That(action.controls[0], Is.SameAs(gamepad.buttonNorth)); } }) - .MeasurementCount(10000) + .MeasurementCount(100) .WarmupCount(5) .Run(); } @@ -432,7 +432,7 @@ public enum LookupByName CaseDoesNotMatch } - [Test, Performance, Version("2")] + [Test, Performance] [Category("Performance")] [TestCase(LookupByName.CaseMatches)] [TestCase(LookupByName.CaseDoesNotMatch)] @@ -449,12 +449,12 @@ public void Performance_LookupActionByName(LookupByName lookup) { var _ = asset[(lookup == LookupByName.CaseDoesNotMatch ? "ACTION" : "action") + (int)(kActionCount * 0.75f)]; }) - .MeasurementCount(10000) + .MeasurementCount(100) .WarmupCount(5) .Run(); } - [Test, Performance, Version("2")] + [Test, Performance] [Category("Performance")] public void Performance_LookupActionByGuid() { @@ -477,13 +477,13 @@ public void Performance_LookupActionByGuid() { Assert.That(asset[actionToFind.id.ToString()], Is.SameAs(actionToFind)); }) - .MeasurementCount(10000) + .MeasurementCount(100) .WarmupCount(5) .Run(); } // We're hitting MatchesPrefix a lot from rebinding, so make sure it's performing reasonably well. - [Test, Performance, Version("2")] + [Test, Performance] [Category("Performance")] public void Performance_MatchControlPathPrefix() { @@ -501,12 +501,12 @@ public void Performance_MatchControlPathPrefix() Assert.That(result3, Is.True); Assert.That(result4, Is.False); }) - .MeasurementCount(10000) + .MeasurementCount(100) .WarmupCount(5) .Run(); } - [Test, Performance, Version("2")] + [Test, Performance] [Category("Performance")] [TestCase("Gamepad")] [TestCase("Touchscreen")] @@ -532,7 +532,7 @@ public void Performance_FindControlScheme(string device1, string device2 = null, match.Dispose(); Assert.That(result, Is.EqualTo(success)); }) - .MeasurementCount(10000) + .MeasurementCount(100) .WarmupCount(5) .Run(); } @@ -568,7 +568,7 @@ public void SetInternalFeatureFlagsFromTestType(OptimizationTestType testType) InputSystem.settings.SetInternalFeatureFlag(InputFeatureNames.kParanoidReadValueCachingChecks, false); } - [Test, Performance, Version("2")] + [Test, Performance] [Category("Performance")] [TestCase(OptimizationTestType.NoOptimization)] [TestCase(OptimizationTestType.OptimizedControls)] @@ -593,12 +593,12 @@ public void Performance_OptimizedControls_ReadingMousePosition100kTimes(Optimiza for (var i = 0; i < 100000; ++i) pos += mouse.position.ReadValue(); }) - .MeasurementCount(1000) + .MeasurementCount(100) .WarmupCount(5) .Run(); } - [Test, Performance, Version("2")] + [Test, Performance] [Category("Performance")] [TestCase(OptimizationTestType.NoOptimization)] [TestCase(OptimizationTestType.OptimizedControls)] @@ -636,12 +636,12 @@ public void Performance_OptimizedControls_ReadAndUpdateMousePosition1kTimes(Opti } } }) - .MeasurementCount(1000) + .MeasurementCount(100) .WarmupCount(5) .Run(); } - [Test, Performance, Version("2")] + [Test, Performance] [Category("Performance")] [TestCase(OptimizationTestType.NoOptimization)] [TestCase(OptimizationTestType.ReadValueCaching)] @@ -679,12 +679,12 @@ public void Performance_OptimizedControls_ReadAndUpdateGamepad1kTimes(Optimizati } } }) - .MeasurementCount(1000) + .MeasurementCount(100) .WarmupCount(10) .Run(); } - [Test, Performance, Version("2")] + [Test, Performance] [Category("Performance")] [TestCase(OptimizationTestType.NoOptimization)] [TestCase(OptimizationTestType.ReadValueCaching)] @@ -716,7 +716,7 @@ public void Performance_OptimizedControls_ReadAndUpdateGamepadNewValuesEveryFram InputSystem.QueueStateEvent(gamepad, new GamepadState { leftStick = new Vector2(i / 1000f, i / 1000f) }); } }) - .MeasurementCount(1000) + .MeasurementCount(100) .WarmupCount(10) .Run(); } @@ -762,7 +762,7 @@ public void Performance_OptimizedControls_ReadAndUpdateKeyboard1kTimes(Optimizat } } }) - .MeasurementCount(1000) + .MeasurementCount(100) .WarmupCount(10) .Run(); } @@ -804,12 +804,12 @@ public void Performance_OptimizedControls_ReadAndUpdateKeyboardNewValuesEveryFra InputSystem.QueueStateEvent(keyboard, new KeyboardState(Key.F)); } }) - .MeasurementCount(1000) + .MeasurementCount(100) .WarmupCount(10) .Run(); } - [Test, Performance, Version("2")] + [Test, Performance] [Category("Performance")] [TestCase(OptimizationTestType.NoOptimization)] [TestCase(OptimizationTestType.OptimizedControls)] @@ -830,7 +830,7 @@ public void Performance_OptimizedControls_UpdateOnly1kTimes(OptimizationTestType { CallUpdate(); }) - .MeasurementCount(1000) + .MeasurementCount(100) .SampleGroup("Mouse Only") .WarmupCount(10) .Run(); @@ -843,7 +843,7 @@ public void Performance_OptimizedControls_UpdateOnly1kTimes(OptimizationTestType { CallUpdate(); }) - .MeasurementCount(1000) + .MeasurementCount(100) .SampleGroup("Gamepad Only") .WarmupCount(10) .Run(); @@ -906,7 +906,7 @@ public void Performance_OptimizedControls_Gamepad_250PressAndUpdate_WasPressedTh { CallUpdate(); }) - .MeasurementCount(1000) + .MeasurementCount(100) .SampleGroup("Gamepad Only") .WarmupCount(10) .Run(); @@ -969,7 +969,7 @@ public void Performance_OptimizedControls_Keyboard_250PressAndUpdate_WasPressedT { CallUpdate(); }) - .MeasurementCount(1000) + .MeasurementCount(100) .SampleGroup("Keyboard Only") .WarmupCount(10) .Run(); @@ -982,7 +982,7 @@ void CallUpdate() } } - [Test, Performance, Version("2")] + [Test, Performance] [Category("Performance")] [TestCase(OptimizationTestType.NoOptimization)] [TestCase(OptimizationTestType.ReadValueCaching)] @@ -1066,7 +1066,7 @@ void MethodToMeasure(Gamepad g) } #if ENABLE_VR - [Test, Performance, Version("2")] + [Test, Performance] [Category("Performance")] [TestCase(OptimizationTestType.NoOptimization)] [TestCase(OptimizationTestType.OptimizedControls)] @@ -1100,4 +1100,4 @@ public void Performance_OptimizedControls_ReadingPose4kTimes(OptimizationTestTyp } #endif -} +} \ No newline at end of file From 51f7c57a7a6c2a343fb7beacf890b5d326840555 Mon Sep 17 00:00:00 2001 From: Stefan Schubert Date: Tue, 3 Sep 2024 17:34:52 +0200 Subject: [PATCH 30/34] remove unneeded words from names --- .yamato/upm-ci.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.yamato/upm-ci.yml b/.yamato/upm-ci.yml index dbdd0ccc94..bf2454b99b 100644 --- a/.yamato/upm-ci.yml +++ b/.yamato/upm-ci.yml @@ -5,7 +5,7 @@ {% for platform in platforms_win %} {% for category in test_category %} {{ platform.name }}_{{ editor.version }}_{{ category.name }}: - name : Build & Test {{ editor.version }} - {{ platform.name }}, {{ category.name }} tests + name : Build & Run {{ editor.version }} - {{ platform.name }}, {{ category.name }} tests agent: type: {{ platform.type }} image: {{ platform.image }} @@ -43,7 +43,7 @@ {% for platform in platforms_nix %} {% for category in test_category %} {{ platform.name }}_{{ editor.version }}_{{ category.name }}: - name : Build & Test {{ editor.version }} - {{ platform.name }}, {{ category.name }} tests + name : Build & Run {{ editor.version }} - {{ platform.name }}, {{ category.name }} tests agent: type: {{ platform.type }} image: {{ platform.image }} @@ -82,7 +82,7 @@ {% for editor in editors %} {% for category in test_category %} build_ios_{{ editor.version }}_{{ category.name }}: - name: Build Tests - {{ editor.version }} - iOS, {{ category.name }} tests + name: Build - {{ editor.version }} - iOS, {{ category.name }} tests agent: type: Unity::VM::osx image: {{ ios_and_tvos_macos_bokken_image }} @@ -101,7 +101,7 @@ build_ios_{{ editor.version }}_{{ category.name }}: - "build/logs/**" run_ios_{{ editor.version }}_{{ category.name }}: - name: Run Tests - {{ editor.version }} - iOS, {{ category.name }} tests + name: Run - {{ editor.version }} - iOS, {{ category.name }} tests agent: type: Unity::mobile::iPhone image: {{ ios_and_tvos_macos_bokken_image }} @@ -120,7 +120,7 @@ run_ios_{{ editor.version }}_{{ category.name }}: {% endfor %} #category build_tvos_{{ editor.version }}: - name: Build Tests - {{ editor.version }} - tvOS + name: Build - {{ editor.version }} - tvOS agent: type: Unity::VM::osx image: {{ ios_and_tvos_macos_bokken_image }} @@ -139,7 +139,7 @@ build_tvos_{{ editor.version }}: - "build/logs/**" run_tvos_{{ editor.version }}: - name: Run Tests - {{ editor.version }} - tvOS + name: Run - {{ editor.version }} - tvOS agent: type: Unity::mobile::appletv image: {{ ios_and_tvos_macos_bokken_image }} @@ -158,7 +158,7 @@ run_tvos_{{ editor.version }}: {% for backend in scripting_backends %} {% for category in test_category %} build_android_{{ editor.version }}_{{ backend.name }}_{{ category.name }}: - name: Build Tests - {{ editor.version }} - Android {{ backend.name }}, {{ category.name }} tests + name: Build - {{ editor.version }} - Android {{ backend.name }}, {{ category.name }} tests agent: type: Unity::VM image: package-ci/win10:default @@ -177,7 +177,7 @@ build_android_{{ editor.version }}_{{ backend.name }}_{{ category.name }}: - "build/logs/**" run_android_{{ editor.version }}_{{ backend.name }}_{{ category.name }}: - name: Run Tests - {{ editor.version }} - Android {{ backend.name }}, {{ category.name }} tests + name: Run - {{ editor.version }} - Android {{ backend.name }}, {{ category.name }} tests agent: type: Unity::mobile::shield image: package-ci/win10:default From 2396c21242b7b1dc084a92a79362dea71da5c81b Mon Sep 17 00:00:00 2001 From: Stefan Schubert Date: Thu, 5 Sep 2024 12:59:32 +0200 Subject: [PATCH 31/34] update framework to latest, change branches to live --- .yamato/upm-ci.yml | 5 ++++- Packages/manifest.json | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.yamato/upm-ci.yml b/.yamato/upm-ci.yml index bf2454b99b..e14a1094fd 100644 --- a/.yamato/upm-ci.yml +++ b/.yamato/upm-ci.yml @@ -257,9 +257,12 @@ performance_tests_only: {% endfor %} triggers: recurring: - - branch: input/performance-testing-changes + - branch: develop frequency: daily rerun: on_new_revision + - branch: master + frequency: weekly + rerun: on_new_revision {% for run in (1..2) %} publish{% cycle "", "_dryrun" %}: diff --git a/Packages/manifest.json b/Packages/manifest.json index e2741468f9..4acf434955 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -6,7 +6,7 @@ "com.unity.ide.rider": "1.2.1", "com.unity.ide.visualstudio": "2.0.15", "com.unity.settings-manager": "1.0.3", - "com.unity.test-framework": "1.4.3", + "com.unity.test-framework": "1.4.5", "com.unity.test-framework.build": "0.0.1-preview.12", "com.unity.test-framework.performance": "3.0.3", "com.unity.test-framework.utp-reporter": "1.1.0-preview", From 90dc432f4d5b1b79677a525886c25e456e8228c0 Mon Sep 17 00:00:00 2001 From: Stefan Schubert Date: Thu, 5 Sep 2024 13:05:33 +0200 Subject: [PATCH 32/34] comment improvements --- .yamato/upm-ci.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.yamato/upm-ci.yml b/.yamato/upm-ci.yml index e14a1094fd..fd8c5c9ee2 100644 --- a/.yamato/upm-ci.yml +++ b/.yamato/upm-ci.yml @@ -38,8 +38,9 @@ UTR_Output.zip: paths: - "upm-ci~/test-results/**/*" -{% endfor %} # category -{% endfor %} +{% endfor %} # test_category +{% endfor %} # platforms_win + {% for platform in platforms_nix %} {% for category in test_category %} {{ platform.name }}_{{ editor.version }}_{{ category.name }}: @@ -75,9 +76,9 @@ UTR_Output.zip: paths: - "upm-ci~/test-results/**/*" -{% endfor %} -{% endfor %} -{% endfor %} +{% endfor %} # test_category +{% endfor %} # platforms_nix +{% endfor %} # editors {% for editor in editors %} {% for category in test_category %} @@ -117,7 +118,7 @@ run_ios_{{ editor.version }}_{{ category.name }}: logs: paths: - "build/test-results/**" -{% endfor %} #category +{% endfor %} # test_category build_tvos_{{ editor.version }}: name: Build - {{ editor.version }} - tvOS @@ -206,10 +207,9 @@ run_android_{{ editor.version }}_{{ backend.name }}_{{ category.name }}: logs: paths: - "build/test-results/**" -{% endfor %} #category -{% endfor %} - -{% endfor %} +{% endfor %} # test_category +{% endfor %} # scripting_backends +{% endfor %} # editors all_tests: name: All Tests From 9d814b1a2cd8367ed37353d50767fca79cf57c5d Mon Sep 17 00:00:00 2001 From: Stefan Schubert Date: Thu, 5 Sep 2024 13:20:18 +0200 Subject: [PATCH 33/34] formatting --- Assets/Tests/InputSystem/CorePerformanceTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/Tests/InputSystem/CorePerformanceTests.cs b/Assets/Tests/InputSystem/CorePerformanceTests.cs index 3c641239a5..e5480672bd 100644 --- a/Assets/Tests/InputSystem/CorePerformanceTests.cs +++ b/Assets/Tests/InputSystem/CorePerformanceTests.cs @@ -1100,4 +1100,4 @@ public void Performance_OptimizedControls_ReadingPose4kTimes(OptimizationTestTyp } #endif -} \ No newline at end of file +} From 3f56cd946f5834b19048c9729c52b590abc34c44 Mon Sep 17 00:00:00 2001 From: Stefan Schubert Date: Fri, 6 Sep 2024 14:54:54 +0200 Subject: [PATCH 34/34] wrong branch name --- .yamato/upm-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.yamato/upm-ci.yml b/.yamato/upm-ci.yml index fd8c5c9ee2..8ca614a444 100644 --- a/.yamato/upm-ci.yml +++ b/.yamato/upm-ci.yml @@ -260,7 +260,7 @@ performance_tests_only: - branch: develop frequency: daily rerun: on_new_revision - - branch: master + - branch: stable frequency: weekly rerun: on_new_revision