From 4c007176a8c8c58bf99a2a590e1cb587c1f9d5fa Mon Sep 17 00:00:00 2001 From: Drew Scoggins Date: Fri, 6 Nov 2020 11:06:37 -0800 Subject: [PATCH 1/5] Add slash in Windows SoD tool build --- eng/pipelines/coreclr/perf.yml | 2 +- eng/pipelines/coreclr/templates/run-scenarios-job.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/pipelines/coreclr/perf.yml b/eng/pipelines/coreclr/perf.yml index a80e985fef1d3..8295dad096626 100644 --- a/eng/pipelines/coreclr/perf.yml +++ b/eng/pipelines/coreclr/perf.yml @@ -19,7 +19,7 @@ trigger: - SECURITY.md - THIRD-PARTY-NOTICES.TXT -pr: none +#pr: none jobs: # diff --git a/eng/pipelines/coreclr/templates/run-scenarios-job.yml b/eng/pipelines/coreclr/templates/run-scenarios-job.yml index e9db6028f4cdf..de22968e287b5 100644 --- a/eng/pipelines/coreclr/templates/run-scenarios-job.yml +++ b/eng/pipelines/coreclr/templates/run-scenarios-job.yml @@ -127,7 +127,7 @@ jobs: PERFLAB_TARGET_FRAMEWORKS: netcoreapp3.1 condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT')) # build SizeOnDisk - - script: $(PayloadDirectory)\dotnet\dotnet.exe publish -c Release -o $(WorkItemDirectory)SOD -f netcoreapp3.1 -r win-$(Architecture) $(PerformanceDirectory)\src\tools\ScenarioMeasurement\SizeOnDisk\SizeOnDisk.csproj + - script: $(PayloadDirectory)\dotnet\dotnet.exe publish -c Release -o $(WorkItemDirectory)\SOD -f netcoreapp3.1 -r win-$(Architecture) $(PerformanceDirectory)\src\tools\ScenarioMeasurement\SizeOnDisk\SizeOnDisk.csproj displayName: Build SizeOnDisk tool (Windows) env: PERFLAB_TARGET_FRAMEWORKS: netcoreapp3.1 From 63cd91ba9688878f5541311fbd7604cce68519a4 Mon Sep 17 00:00:00 2001 From: Drew Scoggins Date: Fri, 6 Nov 2020 13:05:30 -0800 Subject: [PATCH 2/5] Update SoD search path to match output dir --- eng/common/performance/crossgen_perf.proj | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/eng/common/performance/crossgen_perf.proj b/eng/common/performance/crossgen_perf.proj index 79a5486546ea2..e3a4ee372b21a 100644 --- a/eng/common/performance/crossgen_perf.proj +++ b/eng/common/performance/crossgen_perf.proj @@ -68,9 +68,15 @@ $(WorkItemDirectory) +<<<<<<< HEAD $(Python) pre.py crossgen --core-root $(CoreRoot) --single %(Identity) $(Python) test.py sod --scenario-name "Crossgen %(Identity) Size" --dirs ./crossgen/ $(Python) post.py +======= + $(Python) $(CrossgenDirectory)pre.py crossgen --core-root $(CoreRoot) --single %(Identity) + $(Python) $(CrossgenDirectory)test.py sod --scenario-name "Crossgen %(Identity) Size" --dirs ./crossgen.out/ + $(Python) $(CrossgenDirectory)post.py +>>>>>>> f971bc25b3f... Update SoD search path to match output dir @@ -78,8 +84,13 @@ $(WorkItemDirectory) $(Python) $(Crossgen2Directory)pre.py crossgen2 --core-root $(CoreRoot) --single %(Identity) +<<<<<<< HEAD $(Python) test.py sod --scenario-name "Crossgen2 %(Identity) Size" --dirs ./crossgen/ $(Python) post.py +======= + $(Python) $(Crossgen2Directory)test.py sod --scenario-name "Crossgen2 %(Identity) Size" --dirs ./crossgen.out/ + $(Python) $(Crossgen2Directory)post.py +>>>>>>> f971bc25b3f... Update SoD search path to match output dir From d80e0eae10a2e0f6dd2087c2b5aec4cf47b0bc19 Mon Sep 17 00:00:00 2001 From: Drew Scoggins Date: Fri, 6 Nov 2020 14:44:31 -0800 Subject: [PATCH 3/5] Fixup dotnet version --- eng/common/performance/performance-setup.ps1 | 4 +++- eng/common/performance/performance-setup.sh | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/eng/common/performance/performance-setup.ps1 b/eng/common/performance/performance-setup.ps1 index 656c0bd9022cb..0edb2ae276ed8 100644 --- a/eng/common/performance/performance-setup.ps1 +++ b/eng/common/performance/performance-setup.ps1 @@ -82,7 +82,9 @@ $SetupArguments = "--repository https://github.com/$Repository --branch $Branch #This grabs the LKG version number of dotnet and passes it to our scripts $VersionJSON = Get-Content global.json | ConvertFrom-Json $DotNetVersion = $VersionJSON.tools.dotnet -$SetupArguments = "--dotnet-versions $DotNetVersion $SetupArguments" +# TODO: Change this back to parsing when we have a good story for dealing with TFM changes or when the LKG in runtime gets updated to include net6.0 +# $SetupArguments = "--dotnet-versions $DotNetVersion $SetupArguments" +$SetupArguments = "--dotnet-versions 6.0.100-alpha.1.20553.6 $SetupArguments" if ($RunFromPerformanceRepo) { diff --git a/eng/common/performance/performance-setup.sh b/eng/common/performance/performance-setup.sh index 9c0f6c9091452..315815a967774 100755 --- a/eng/common/performance/performance-setup.sh +++ b/eng/common/performance/performance-setup.sh @@ -223,7 +223,9 @@ if [[ "$use_latest_dotnet" = false ]]; then # Get the tools section from the global.json. # This grabs the LKG version number of dotnet and passes it to our scripts dotnet_version=`cat global.json | python3 -c 'import json,sys;obj=json.load(sys.stdin);print(obj["tools"]["dotnet"])'` - setup_arguments="--dotnet-versions $dotnet_version $setup_arguments" + # TODO: Change this back to parsing when we have a good story for dealing with TFM changes or when the LKG in runtime gets updated to include net6.0 + # setup_arguments="--dotnet-versions $dotnet_version $setup_arguments" + setup_arguments="--dotnet-versions 6.0.100-alpha.1.20553.6 $setup_arguments" fi if [[ "$run_from_perf_repo" = true ]]; then From f188b698ce67e4fe8677cebbf5ab3a8ee3544dd1 Mon Sep 17 00:00:00 2001 From: Drew Scoggins Date: Fri, 6 Nov 2020 14:51:06 -0800 Subject: [PATCH 4/5] Remove merge commit headers --- eng/common/performance/crossgen_perf.proj | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/eng/common/performance/crossgen_perf.proj b/eng/common/performance/crossgen_perf.proj index e3a4ee372b21a..48455e7aa8045 100644 --- a/eng/common/performance/crossgen_perf.proj +++ b/eng/common/performance/crossgen_perf.proj @@ -68,15 +68,9 @@ $(WorkItemDirectory) -<<<<<<< HEAD - $(Python) pre.py crossgen --core-root $(CoreRoot) --single %(Identity) - $(Python) test.py sod --scenario-name "Crossgen %(Identity) Size" --dirs ./crossgen/ - $(Python) post.py -======= $(Python) $(CrossgenDirectory)pre.py crossgen --core-root $(CoreRoot) --single %(Identity) $(Python) $(CrossgenDirectory)test.py sod --scenario-name "Crossgen %(Identity) Size" --dirs ./crossgen.out/ $(Python) $(CrossgenDirectory)post.py ->>>>>>> f971bc25b3f... Update SoD search path to match output dir @@ -84,13 +78,8 @@ $(WorkItemDirectory) $(Python) $(Crossgen2Directory)pre.py crossgen2 --core-root $(CoreRoot) --single %(Identity) -<<<<<<< HEAD - $(Python) test.py sod --scenario-name "Crossgen2 %(Identity) Size" --dirs ./crossgen/ - $(Python) post.py -======= $(Python) $(Crossgen2Directory)test.py sod --scenario-name "Crossgen2 %(Identity) Size" --dirs ./crossgen.out/ $(Python) $(Crossgen2Directory)post.py ->>>>>>> f971bc25b3f... Update SoD search path to match output dir From 9fb9d156b3c0d8326949f89db8ab05d48532ee00 Mon Sep 17 00:00:00 2001 From: Drew Scoggins Date: Fri, 6 Nov 2020 17:15:16 -0800 Subject: [PATCH 5/5] Disable PRs --- eng/pipelines/coreclr/perf.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/coreclr/perf.yml b/eng/pipelines/coreclr/perf.yml index 8295dad096626..a80e985fef1d3 100644 --- a/eng/pipelines/coreclr/perf.yml +++ b/eng/pipelines/coreclr/perf.yml @@ -19,7 +19,7 @@ trigger: - SECURITY.md - THIRD-PARTY-NOTICES.TXT -#pr: none +pr: none jobs: #