Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[USDU-304] Add performance Tests #347

Draft
wants to merge 72 commits into
base: dev
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from 32 commits
Commits
Show all changes
72 commits
Select commit Hold shift + click to select a range
9a850d1
Adds Performance Test Project and separates Functional tests and perf…
lee-aandrew Feb 3, 2023
bb09419
Add changes to .gitignore ignoring Usd-Developement-Performance's lib…
lee-aandrew Feb 3, 2023
dcdeaa2
Adds project settings.asset file change
lee-aandrew Feb 6, 2023
292f5d5
Adds placeholder performance test
lee-aandrew Feb 6, 2023
9e4cf7e
Testing change for upm-ci.yml
lee-aandrew Feb 6, 2023
fc5fe47
utr command fix
lee-aandrew Feb 7, 2023
1a689a7
utr command fix
lee-aandrew Feb 7, 2023
9411968
utr command fix
lee-aandrew Feb 7, 2023
c3ffba6
utr upm-ci fix
lee-aandrew Feb 7, 2023
8816e26
utr upm-ci fix
lee-aandrew Feb 7, 2023
f90e49d
utr upm-ci fix
lee-aandrew Feb 7, 2023
028cde9
utr upm-ci fix
lee-aandrew Feb 7, 2023
8d52eca
utr upm-ci fix
lee-aandrew Feb 7, 2023
e8111d9
utr upm-ci fix
lee-aandrew Feb 7, 2023
cf4e1dd
utr upm-ci fix
lee-aandrew Feb 7, 2023
dcf052c
utr upm-ci fix
lee-aandrew Feb 7, 2023
8237964
utr upm-ci fix
lee-aandrew Feb 7, 2023
0110663
utr upm-ci fix
lee-aandrew Feb 7, 2023
fd86151
adding placeholder performance test case
lee-aandrew Feb 8, 2023
49c4d84
fixing platform.version -> editor.version
lee-aandrew Feb 8, 2023
6a28786
removing com.unity.feature.development pacakge from performance project
lee-aandrew Feb 8, 2023
94ea83c
adds chmod to mac utr
lee-aandrew Feb 8, 2023
61d2ef6
adds performance test package to dependency & attempt to fix mac vers…
lee-aandrew Feb 8, 2023
d826683
fixing upm-ci.yml
lee-aandrew Feb 8, 2023
71f3527
update package for performance projects, add --clean-library for utr …
lee-aandrew Feb 8, 2023
3393872
Removes Clean library option
lee-aandrew Feb 8, 2023
159fdce
apply clean library to only the performance test
lee-aandrew Feb 8, 2023
a2ba2dd
removes package com.unity.coding since its a known issue to be errori…
lee-aandrew Feb 9, 2023
b742281
Point instancer performance test
lee-aandrew Feb 17, 2023
514e3e2
enable 10k larger test file for import as object test cases
lee-aandrew Feb 20, 2023
3bdab81
fix formatting issue and remove changes to the functional test project
lee-aandrew Feb 20, 2023
f580cfa
Remove unnecessary changes to the asmdef files
lee-aandrew Feb 20, 2023
cedb2d8
Applying PR suggestions
lee-aandrew Feb 28, 2023
361553f
fix formatting issue
lee-aandrew Mar 1, 2023
292f785
fix yamato upm-ci.yml if statement
lee-aandrew Mar 1, 2023
996f823
Merge branch 'dev' into add-Performance-Tests
lee-aandrew Mar 10, 2023
6351a81
fix directory change in upm-ci.yml
lee-aandrew Mar 10, 2023
2310374
Merge branch 'add-Performance-Tests' of https://github.com/Unity-Tech…
lee-aandrew Mar 10, 2023
7519af4
Change location of performance test to the project folder and out of …
lee-aandrew Mar 10, 2023
cecc7f9
removing artifacts folder
lee-aandrew Mar 10, 2023
cd283d6
Decouples Performance tests from the functional tests - Moves USDInit…
lee-aandrew Mar 13, 2023
c4b7a8b
Ignores two unstable test cases until a fix has been found
lee-aandrew Mar 21, 2023
464ea5b
Merge branch 'dev' of https://github.com/Unity-Technologies/usd-unity…
lee-aandrew Mar 29, 2023
7af60ed
Merge branch 'dev' of https://github.com/Unity-Technologies/usd-unity…
lee-aandrew Mar 31, 2023
20dc1c7
Merge branch 'dev' of https://github.com/Unity-Technologies/usd-unity…
lee-aandrew Apr 12, 2023
4236bd0
Merge branch 'dev' of https://github.com/Unity-Technologies/usd-unity…
lee-aandrew Apr 14, 2023
2d14b87
Merge branch 'dev' of https://github.com/Unity-Technologies/usd-unity…
lee-aandrew Apr 18, 2023
bb60d3e
Merge branch 'dev' of https://github.com/Unity-Technologies/usd-unity…
lee-aandrew Apr 19, 2023
9336edf
Merge branch 'dev' of https://github.com/Unity-Technologies/usd-unity…
lee-aandrew Apr 21, 2023
5695de5
Merge branch 'dev' of https://github.com/Unity-Technologies/usd-unity…
lee-aandrew May 10, 2023
3b0e137
Merge branch 'dev' of https://github.com/Unity-Technologies/usd-unity…
lee-aandrew May 11, 2023
fe2c564
Adds Performance Test Project and separates Functional tests and perf…
lee-aandrew Feb 3, 2023
08dd122
Add changes to .gitignore ignoring Usd-Developement-Performance's lib…
lee-aandrew Feb 3, 2023
945b30c
Adds project settings.asset file change
lee-aandrew Feb 6, 2023
4bc4f6e
Adds placeholder performance test
lee-aandrew Feb 6, 2023
2e73bc7
utr command fix
lee-aandrew Feb 7, 2023
fabe5bb
adding placeholder performance test case
lee-aandrew Feb 8, 2023
148474d
removing com.unity.feature.development pacakge from performance project
lee-aandrew Feb 8, 2023
b7d28ca
adds performance test package to dependency & attempt to fix mac vers…
lee-aandrew Feb 8, 2023
3692ab7
update package for performance projects, add --clean-library for utr …
lee-aandrew Feb 8, 2023
6bbb904
removes package com.unity.coding since its a known issue to be errori…
lee-aandrew Feb 9, 2023
8d43a0e
Point instancer performance test
lee-aandrew Feb 17, 2023
d1e1cd5
enable 10k larger test file for import as object test cases
lee-aandrew Feb 20, 2023
4ce65ff
fix formatting issue and remove changes to the functional test project
lee-aandrew Feb 20, 2023
da706dc
Remove unnecessary changes to the asmdef files
lee-aandrew Feb 20, 2023
3d9ab53
Applying PR suggestions
lee-aandrew Feb 28, 2023
88b656c
fix formatting issue
lee-aandrew Mar 1, 2023
0f50c82
Change location of performance test to the project folder and out of …
lee-aandrew Mar 10, 2023
065bb34
removing artifacts folder
lee-aandrew Mar 10, 2023
7c9d53b
Decouples Performance tests from the functional tests - Moves USDInit…
lee-aandrew Mar 13, 2023
c72d9d9
fixes merge issue with rebase
lee-aandrew May 16, 2023
5774cb0
Merge branch 'add-Performance-Tests' of https://github.com/Unity-Tech…
lee-aandrew May 16, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 1 addition & 8 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -54,14 +54,6 @@ packages.config
# UPM
upm-ci~

TestProject/Library
TestProject/ProjectSettings
TestProject/Temp
TestProject/*.sln*
TestProject/*.csproj
TestProject/.idea
TestProject/Logs
TestProject/Assets/*
inst-dbg/
package/com.unity.formats.usd/TestRunnerOptions.json.meta
/artifacts/
Expand All @@ -73,3 +65,4 @@ TestProject/**/*.csproj
TestProject/**/*.sln
TestProject/Usd-Development/Library
build_usdcs
TestProject/Usd-Development-Performance/Library
34 changes: 31 additions & 3 deletions .yamato/upm-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,14 @@ test_platforms:
type: Unity::VM
image: package-ci/win10:stable
flavor: b1.large
utr_install: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat
utr_performance_test: utr --suite=editor --clean-library --category="Performance" --testproject=TestProject/Usd-Development-Performance --editor-location=.Editor --report-performance-data
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To report data to Observer I think you also need to pass a project ID, ie: --performance-project-id=com.unity.formats.usd

- name: mac
type: Unity::VM::osx
image: package-ci/mac:stable
flavor: m1.mac
utr_install: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr; chmod +x utr
utr_performance_test: ./utr --suite=editor --clean-library --category="Performance" --testproject=TestProject/Usd-Development-Performance --editor-location=.Editor --report-performance-data
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As above, --performance-project-id=com.unity.formats.usd

test_backends:
- name: il2cpp
editor: 2020.3
Expand Down Expand Up @@ -44,7 +48,7 @@ test_{{ platform.name }}_{{ editor.version }}:
flavor: {{ platform.flavor}}
commands:
- npm install upm-ci-utils@latest -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
- upm-ci package test --unity-version {{ editor.version }} --package-path package/com.unity.formats.usd --extra-create-project-arg=-upmNoDefaultPackages --extra-utr-arg="--api-profile=NET_4_6"
- upm-ci package test --unity-version {{ editor.version }} --package-path package/com.unity.formats.usd --extra-create-project-arg=-upmNoDefaultPackages --extra-utr-arg="--api-profile=NET_4_6 --category=!Performance"
artifacts:
logs:
paths:
Expand All @@ -56,7 +60,29 @@ test_{{ platform.name }}_{{ editor.version }}:

{% for editor in test_editors %}
{% for platform in test_platforms %}
test_recorder{{ platform.name }}_{{ editor.version }}:
test_performance_{{ platform.name }}_{{ editor.version }}:
name : Performance Test {{ editor.version }} on {{ platform.name }}
agent:
type: {{ platform.type }}
image: {{ platform.image }}
flavor: {{ platform.flavor}}
commands:
- unity-downloader-cli -u {{ editor.version }} -c editor
- {{ platform.utr_install }}
- {{ platform.utr_performance_test }}
artifacts:
logs:
paths:
- "upm-ci~/test-results/**/*"
dependencies:
- .yamato/upm-ci.yml#pack
{% endfor %}
{% endfor %}


{% for editor in test_editors %}
{% for platform in test_platforms %}
test_recorder_{{ platform.name }}_{{ editor.version }}:
name : Test Recorder{{ editor.version }} on {{ platform.name }}
agent:
type: {{ platform.type }}
Expand Down Expand Up @@ -108,7 +134,8 @@ test_trigger:
{% for editor in test_editors %}
{% for platform in test_platforms %}
- .yamato/upm-ci.yml#test_{{platform.name}}_{{editor.version}}
- .yamato/upm-ci.yml#test_recorder{{platform.name}}_{{editor.version}}
- .yamato/upm-ci.yml#test_recorder_{{platform.name}}_{{editor.version}}
- .yamato/upm-ci.yml#test_performance_{{platform.name}}_{{editor.version}}
{% endfor %}
{% endfor %}
{% for backend in test_backends %}
Expand All @@ -118,6 +145,7 @@ test_trigger:
{% endfor %}
- .yamato/formatting.yml#formatting


nightly_test_trigger:
name: Nightly tests Trigger
triggers:
Expand Down
Binary file not shown.
6 changes: 6 additions & 0 deletions TestProject/Usd-Development-Performance/.vsconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"version": "1.0",
"components": [
"Microsoft.VisualStudio.Workload.ManagedGame"
]
}
Empty file.
8 changes: 8 additions & 0 deletions TestProject/Usd-Development-Performance/Assets/Resources.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

45 changes: 45 additions & 0 deletions TestProject/Usd-Development-Performance/Packages/manifest.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
{
"dependencies": {
"com.unity.analytics": "3.6.12",
"com.unity.ext.nunit": "1.0.6",
"com.unity.formats.usd": "file:../../../package/com.unity.formats.usd/",
"com.unity.ide.rider": "3.0.16",
"com.unity.ide.visualstudio": "2.0.16",
"com.unity.recorder": "3.0.3",
"com.unity.test-framework": "1.1.31",
"com.unity.test-framework.performance": "2.8.1-preview",
"com.unity.modules.ai": "1.0.0",
"com.unity.modules.animation": "1.0.0",
"com.unity.modules.assetbundle": "1.0.0",
"com.unity.modules.audio": "1.0.0",
"com.unity.modules.cloth": "1.0.0",
"com.unity.modules.director": "1.0.0",
"com.unity.modules.imageconversion": "1.0.0",
"com.unity.modules.imgui": "1.0.0",
"com.unity.modules.jsonserialize": "1.0.0",
"com.unity.modules.particlesystem": "1.0.0",
"com.unity.modules.physics": "1.0.0",
"com.unity.modules.physics2d": "1.0.0",
"com.unity.modules.screencapture": "1.0.0",
"com.unity.modules.terrain": "1.0.0",
"com.unity.modules.terrainphysics": "1.0.0",
"com.unity.modules.tilemap": "1.0.0",
"com.unity.modules.ui": "1.0.0",
"com.unity.modules.uielements": "1.0.0",
"com.unity.modules.umbra": "1.0.0",
"com.unity.modules.unityanalytics": "1.0.0",
"com.unity.modules.unitywebrequest": "1.0.0",
"com.unity.modules.unitywebrequestassetbundle": "1.0.0",
"com.unity.modules.unitywebrequestaudio": "1.0.0",
"com.unity.modules.unitywebrequesttexture": "1.0.0",
"com.unity.modules.unitywebrequestwww": "1.0.0",
"com.unity.modules.vehicles": "1.0.0",
"com.unity.modules.video": "1.0.0",
"com.unity.modules.vr": "1.0.0",
"com.unity.modules.wind": "1.0.0",
"com.unity.modules.xr": "1.0.0"
},
"testables": [
"com.unity.formats.usd"
]
}
Loading