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.

Sign up for GitHub

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

Disallowing using COMPlus_ has the prefix for environment variables. #3815

Closed
wants to merge 11 commits into from
Closed

Disallowing using COMPlus_ has the prefix for environment variables. #3815

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
0d3885d
Added the GC Infrastructure
mrsharm May 17, 2023
961607b
Revert "Added the GC Infrastructure"
mrsharm Jun 26, 2023
501b5c4
Merge branch 'main' of https://github.com/dotnet/performance
mrsharm Jun 26, 2023
5af6979
Merge branch 'main' of https://github.com/dotnet/performance
mrsharm Nov 15, 2023
b15da34
Merge branch 'main' of https://github.com/dotnet/performance
mrsharm Jan 24, 2024
d15bd26
Added all YAML files with COMPlus replaced with DOTNET
mrsharm Jan 24, 2024
b337c0b
Added all cs files to be strict about COMPlus environment vars
mrsharm Jan 24, 2024
42379a5
Updated readme
mrsharm Jan 24, 2024
d961735
Update src/benchmarks/gc/GC.Infrastructure/README.md
mrsharm Jan 31, 2024
67ba56e
Fix GCServer -> gcServer
mrsharm Jan 31, 2024
69ae978
Moved GCServer -> gcServer
mrsharm Feb 1, 2024
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
4 changes: 2 additions & 2 deletions src/benchmarks/gc/GC.Infrastructure/Configurations/ASPNetBenchmarks/ASPNetBenchmarks.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ runs:
baseline:
corerun: C:\CoreRuns\Empty\
environment_variables:
COMPlus_GCServer: 1
DOTNET_gcServer: 1
framework_version: net6.0
run:
corerun: C:\CoreRuns\Empty\
environment_variables:
COMPlus_GCServer: 1
DOTNET_gcServer: 1
environment:
environment_variables: {}
default_max_seconds: 300
Expand Down
16 changes: 8 additions & 8 deletions src/benchmarks/gc/GC.Infrastructure/Configurations/GCPerfSim/HighMemory.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ runs:
tlgb: 3
sohsi: 50
environment_variables:
COMPlus_GCServer: 0
DOTNET_gcServer: 0

# Top level microbenchmark configuration.
gcperfsim_configurations:
Expand Down Expand Up @@ -39,19 +39,19 @@ coreruns:
baseline:
path: C:\CoreRuns\EmitEvent_Core_Root\corerun.exe
environment_variables:
COMPlus_GCName: clrgc.dll
DOTNET_GCName: clrgc.dll
run:
path: C:\CoreRuns\EmitEvent_Core_Root\corerun.exe
environment_variables:
COMPlus_GCName: clrgc.dll
DOTNET_GCName: clrgc.dll

environment:
environment_variables:
COMPlus_GCServer: 1
COMPlus_GCHeapCount: 18
COMPlus_GCName: clrgc.dll
COMPlus_GCHeapHardLimit: "0x100000000"
COMPlus_GCTotalPhysicalMemory: "0x100000000"
DOTNET_gcServer: 1
DOTNET_GCHeapCount: 18
DOTNET_GCName: clrgc.dll
DOTNET_GCHeapHardLimit: "0x100000000"
DOTNET_GCTotalPhysicalMemory: "0x100000000"
default_max_seconds: 300
iterations: 1

Expand Down
10 changes: 5 additions & 5 deletions src/benchmarks/gc/GC.Infrastructure/Configurations/GCPerfSim/LargePages_NormalServer.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,11 @@

environment:
environment_variables:
COMPlus_GCServer: 1
COMPlus_GCLargePages: 1
COMPlus_GCHeapHardLimitSOH: 0x800000000
COMPlus_GCHeapHardLimitLOH: 0x400000000
COMPlus_GCHeapHardLimitPOH: 0x100000000
DOTNET_gcServer: 1
DOTNET_GCLargePages: 1
DOTNET_GCHeapHardLimitSOH: 0x800000000
DOTNET_GCHeapHardLimitLOH: 0x400000000
DOTNET_GCHeapHardLimitPOH: 0x100000000
default_max_seconds: 300
iterations: 1

Expand Down
16 changes: 8 additions & 8 deletions src/benchmarks/gc/GC.Infrastructure/Configurations/GCPerfSim/LargePages_Server.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,23 +44,23 @@ gcperfsim_configurations:
gcperfsim_path: C:\performance\artifacts\bin\GCPerfSim\release\net7.0\GCPerfSim.dll
environment:
environment_variables:
COMPlus_GCServer: 1
COMPlus_GCHeapCount: 12
COMPlus_GCLargePages: 1
COMPlus_GCHeapHardLimitSOH: 0x800000000
COMPlus_GCHeapHardLimitLOH: 0x400000000
COMPlus_GCHeapHardLimitPOH: 0x100000000
DOTNET_gcServer: 1
DOTNET_GCHeapCount: 12
DOTNET_GCLargePages: 1
DOTNET_GCHeapHardLimitSOH: 0x800000000
DOTNET_GCHeapHardLimitLOH: 0x400000000
DOTNET_GCHeapHardLimitPOH: 0x100000000
default_max_seconds: 300
iterations: 1
coreruns:
baseline:
path: C:\CoreRuns\EmitEvent_Core_Root\corerun.exe
environment_variables:
COMPlus_GCName: clrgc.dll
DOTNET_GCName: clrgc.dll
run:
path: C:\CoreRuns\EmitEvent_Core_Root\corerun.exe
environment_variables:
COMPlus_GCName: clrgc.dll
DOTNET_GCName: clrgc.dll
linux_coreruns:
output:
path: C:\InfraRuns\RunNew_All\GCPerfSim\LargePages_Server
Expand Down
14 changes: 7 additions & 7 deletions src/benchmarks/gc/GC.Infrastructure/Configurations/GCPerfSim/LargePages_Workstation.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,22 +44,22 @@ gcperfsim_configurations:
gcperfsim_path: C:\performance\artifacts\bin\GCPerfSim\release\net7.0\GCPerfSim.dll
environment:
environment_variables:
COMPlus_GCServer: 0
COMPlus_GCLargePages: 1
COMPlus_GCHeapHardLimitSOH: 0x800000000
COMPlus_GCHeapHardLimitLOH: 0x400000000
COMPlus_GCHeapHardLimitPOH: 0x100000000
DOTNET_gcServer: 0
DOTNET_GCLargePages: 1
DOTNET_GCHeapHardLimitSOH: 0x800000000
DOTNET_GCHeapHardLimitLOH: 0x400000000
DOTNET_GCHeapHardLimitPOH: 0x100000000
default_max_seconds: 300
iterations: 1
coreruns:
baseline:
path: C:\CoreRuns\EmitEvent_Core_Root\corerun.exe
environment_variables:
COMPlus_GCName: clrgc.dll
DOTNET_GCName: clrgc.dll
run:
path: C:\CoreRuns\EmitEvent_Core_Root\corerun.exe
environment_variables:
COMPlus_GCName: clrgc.dll
DOTNET_GCName: clrgc.dll
linux_coreruns:
output:
path: C:\InfraRuns\RunNew_All\GCPerfSim\LargePages_Workstation
Expand Down
16 changes: 8 additions & 8 deletions src/benchmarks/gc/GC.Infrastructure/Configurations/GCPerfSim/LowMemoryContainer.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ runs:
tc: 2
tlgb: 0.5
environment_variables:
COMPlus_GCServer: 0
COMPlus_GCHeapCount: 1
DOTNET_gcServer: 0
DOTNET_GCHeapCount: 1

# Top level microbenchmark configuration.
gcperfsim_configurations:
Expand Down Expand Up @@ -41,18 +41,18 @@ coreruns:
baseline:
path: C:\CoreRuns\EmitEvent_Core_Root\corerun.exe
environment_variables:
COMPlus_GCName: clrgc.dll
DOTNET_GCName: clrgc.dll
run:
path: C:\CoreRuns\EmitEvent_Core_Root\corerun.exe
environment_variables:
COMPlus_GCName: clrgc.dll
DOTNET_GCName: clrgc.dll

environment:
environment_variables:
COMPlus_GCServer: 1
COMPlus_GCHeapCount: 4
COMPlus_GCHeapHardLimit: "0x23C34600"
COMPlus_GCTotalPhysicalMemory: "0x23C34600"
DOTNET_gcServer: 1
DOTNET_GCHeapCount: 4
DOTNET_GCHeapHardLimit: "0x23C34600"
DOTNET_GCTotalPhysicalMemory: "0x23C34600"
default_max_seconds: 300
iterations: 1

Expand Down
8 changes: 4 additions & 4 deletions src/benchmarks/gc/GC.Infrastructure/Configurations/GCPerfSim/LowVolatilityRuns.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,19 +51,19 @@ gcperfsim_configurations:
gcperfsim_path: C:\performance\artifacts\bin\GCPerfSim\release\net7.0\GCPerfSim.dll
environment:
environment_variables:
COMPlus_GCServer: 1
COMPlus_GCHeapCount: 12
DOTNET_gcServer: 1
DOTNET_GCHeapCount: 12
default_max_seconds: 300
iterations: 1
coreruns:
baseline:
path: C:\CoreRuns\EmitEvent_Core_Root\corerun.exe
environment_variables:
COMPlus_GCName: clrgc.dll
DOTNET_GCName: clrgc.dll
run:
path: C:\CoreRuns\EmitEvent_Core_Root\corerun.exe
environment_variables:
COMPlus_GCName: clrgc.dll
DOTNET_GCName: clrgc.dll
linux_coreruns:
output:
path: C:\InfraRuns\GCPerfSim\
Expand Down
8 changes: 4 additions & 4 deletions src/benchmarks/gc/GC.Infrastructure/Configurations/GCPerfSim/Normal_Server.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,19 +44,19 @@ gcperfsim_configurations:
gcperfsim_path: C:\performance\artifacts\bin\GCPerfSim\release\net7.0\GCPerfSim.dll
environment:
environment_variables:
COMPlus_GCServer: 1
COMPlus_GCHeapCount: 12
DOTNET_gcServer: 1
DOTNET_GCHeapCount: 12
default_max_seconds: 300
iterations: 1
coreruns:
baseline:
path: C:\CoreRuns\EmitEvent_Core_Root\corerun.exe
environment_variables:
COMPlus_GCName: clrgc.dll
DOTNET_GCName: clrgc.dll
run:
path: C:\CoreRuns\EmitEvent_Core_Root\corerun.exe
environment_variables:
COMPlus_GCName: clrgc.dll
DOTNET_GCName: clrgc.dll
linux_coreruns:
output:
path: C:\InfraRuns\RunNew_All\GCPerfSim\Normal_Server_
Expand Down
6 changes: 3 additions & 3 deletions src/benchmarks/gc/GC.Infrastructure/Configurations/GCPerfSim/Normal_Workstation.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,18 +44,18 @@ gcperfsim_configurations:
gcperfsim_path: C:\performance\artifacts\bin\GCPerfSim\release\net7.0\GCPerfSim.dll
environment:
environment_variables:
COMPlus_GCServer: 0
DOTNET_gcServer: 0
default_max_seconds: 300
iterations: 1
coreruns:
baseline:
path: C:\CoreRuns\EmitEvent_Core_Root\corerun.exe
environment_variables:
COMPlus_GCName: clrgc.dll
DOTNET_GCName: clrgc.dll
run:
path: C:\CoreRuns\EmitEvent_Core_Root\corerun.exe
environment_variables:
COMPlus_GCName: clrgc.dll
DOTNET_GCName: clrgc.dll
linux_coreruns:
output:
path: C:\InfraRuns\RunNew_All\GCPerfSim\Normal_Workstation
Expand Down
6 changes: 3 additions & 3 deletions src/benchmarks/gc/GC.Infrastructure/Configurations/GCPerfSim/SampleCrank.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# - How to get custom corerun: both as commits and locally.
# --application.options.outputFiles c:\git\runtime\artifacts\bin\coreclr\windows.x64.Release\clrgc.dll
# - How to get environment variables set.
# --application.environmentVariables COMPlus_GCName=clrgc.dll
# --application.environmentVariables DOTNET_GCName=clrgc.dll

# crank --config C:\Users\musharm\source\repos\GC.Analysis.API\ExampleConfigurations\GCPerfSim\SampleCrank.yaml --scenario gcperfsim --profile aspnet-perf-win --application.variables.threadCount 2 --application.options.displayOutput true --application.framework net7.0 --profile pgo --application.cpuSet 1 --application.options.collectCounters true --chart --json Result_1.json --property cpu=2
# crank --config C:\Users\musharm\source\repos\GC.Analysis.API\ExampleConfigurations\GCPerfSim\SampleCrank.yaml --scenario gcperfsim --application.variables.tc 2 --application.options.displayOutput true --application.framework net7.0 --profile aspnet-citrine-win --application.collect true --application.collectArguments GCCollectOnly --application.cpuSet 0-1 --application.options.collectCounters true --chart --application.options.downloadOutput true --application.options.downloadOutputOutput ".\gc.etl.zip" --application.options.traceOutput "./gc.etl.zip"
Expand Down Expand Up @@ -98,7 +98,7 @@ scenarios:
application:
job: gcperfsim
environmentVariables:
COMPlus_GCServer: 1
DOTNET_gcServer: 1
variables:
threadCount: 1

Expand All @@ -116,6 +116,6 @@ scenarios:
application:
job: gcperfsim
environmentVariables:
COMPlus_GCServer: 1
DOTNET_gcServer: 1
variables:
threadCount: 1
8 changes: 4 additions & 4 deletions ...benchmarks/gc/GC.Infrastructure/Configurations/Microbenchmark/Microbenchmarks_Server.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@ runs:
corerun: C:\CoreRuns\EmitEvent_Core_Root\corerun.exe
is_baseline: true
environment_variables:
COMPlus_GCName: clrgc.dll
COMPlus_GCServer: 1
DOTNET_GCName: clrgc.dll
DOTNET_gcServer: 1
run:
dotnet_installer:
name: run
corerun: C:\CoreRuns\EmitEvent_Core_Root\corerun.exe
is_baseline: false
environment_variables:
COMPlus_GCName: clrgc.dll
COMPlus_GCServer: 1
DOTNET_GCName: clrgc.dll
DOTNET_gcServer: 1
microbenchmark_configurations:
filter:
filter_path: C:\InfraRuns\RunNew_All\Suites\Microbenchmark\MicrobenchmarksToRun.txt
Expand Down
8 changes: 4 additions & 4 deletions ...marks/gc/GC.Infrastructure/Configurations/Microbenchmark/Microbenchmarks_Workstation.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@ runs:
corerun: C:\CoreRuns\EmitEvent_Core_Root\corerun.exe
is_baseline: true
environment_variables:
COMPlus_GCName: clrgc.dll
COMPlus_GCServer: 0
DOTNET_GCName: clrgc.dll
DOTNET_gcServer: 0
run:
dotnet_installer:
name: run
corerun: C:\CoreRuns\EmitEvent_Core_Root\corerun.exe
is_baseline: false
environment_variables:
COMPlus_GCName: clrgc.dll
COMPlus_GCServer: 0
DOTNET_GCName: clrgc.dll
DOTNET_gcServer: 0
microbenchmark_configurations:
filter:
filter_path: C:\InfraRuns\RunNew_All\Suites\Microbenchmark\MicrobenchmarksToRun.txt
Expand Down
4 changes: 2 additions & 2 deletions src/benchmarks/gc/GC.Infrastructure/Configurations/Run.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ coreruns:
baseline:
path: C:\CoreRuns\EmitEvent_Core_Root\corerun.exe
environment_variables:
COMPlus_GCName: clrgc.dll
DOTNET_GCName: clrgc.dll
run:
path: C:\CoreRuns\EmitEvent_Core_Root\corerun.exe
environment_variables:
COMPlus_GCName: clrgc.dll
DOTNET_GCName: clrgc.dll

trace_configuration_type: gc # Choose between: none, gc, verbose, cpu, cpu_managed, threadtime, join.

Expand Down
20 changes: 10 additions & 10 deletions ...ore.UnitTests/Microbenchmarks/Configurations/NoMicrobenchmarkConfigurationsSpecified.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
runs:
heapcount_1:
environment_variables:
COMPLUS_GCHeapCount: 1
COMPLUS_GCServer: 0
DOTNET_GCHeapCount: 1
DOTNET_gcServer: 0

heapcount_2:
environment_variables:
COMPLUS_GCHeapCount: 2
COMPLUS_GCServer: 1
DOTNET_GCHeapCount: 2
DOTNET_gcServer: 1

heapcount_3:
environment_variables:
COMPLUS_GCHeapCount: 3
COMPLUS_GCServer: 1
DOTNET_GCHeapCount: 3
DOTNET_gcServer: 1

heapcount_4:
environment_variables:
COMPLUS_GCHeapCount: 4
COMPLUS_GCServer: 1
DOTNET_GCHeapCount: 4
DOTNET_gcServer: 1

heapcount_5:
environment_variables:
COMPLUS_GCHeapCount: 5
COMPLUS_GCServer: 1
DOTNET_GCHeapCount: 5
DOTNET_gcServer: 1

# Configurations that involve capturing a trace.
trace_configurations:
Expand Down
20 changes: 10 additions & 10 deletions ...ucture.Core.UnitTests/Microbenchmarks/Configurations/NoMicrobenchmarkFilterSpecified.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
runs:
heapcount_1:
environment_variables:
COMPLUS_GCHeapCount: 1
COMPLUS_GCServer: 0
DOTNET_GCHeapCount: 1
DOTNET_gcServer: 0

heapcount_2:
environment_variables:
COMPLUS_GCHeapCount: 2
COMPLUS_GCServer: 1
DOTNET_GCHeapCount: 2
DOTNET_gcServer: 1

heapcount_3:
environment_variables:
COMPLUS_GCHeapCount: 3
COMPLUS_GCServer: 1
DOTNET_GCHeapCount: 3
DOTNET_gcServer: 1

heapcount_4:
environment_variables:
COMPLUS_GCHeapCount: 4
COMPLUS_GCServer: 1
DOTNET_GCHeapCount: 4
DOTNET_gcServer: 1

heapcount_5:
environment_variables:
COMPLUS_GCHeapCount: 5
COMPLUS_GCServer: 1
DOTNET_GCHeapCount: 5
DOTNET_gcServer: 1

# Top level microbenchmark configuration.
microbenchmark_configurations:
Expand Down
Loading
Loading