Disallowing using COMPlus_ has the prefix for environment variables. (#…

…4148) * Replaced all DOTNET instances with COMPlus * Fixed duplication in the README
dotnet · Apr 16, 2024 · 8fdcd0c · 8fdcd0c
1 parent 1a9c200
commit 8fdcd0c
Show file tree

Hide file tree

Showing 34 changed files with 265 additions and 197 deletions.
diff --git a/src/benchmarks/gc/GC.Infrastructure/Configurations/ASPNetBenchmarks/ASPNetBenchmarks.yaml b/src/benchmarks/gc/GC.Infrastructure/Configurations/ASPNetBenchmarks/ASPNetBenchmarks.yaml
@@ -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

diff --git a/src/benchmarks/gc/GC.Infrastructure/Configurations/GCPerfSim/GCPerfSimFunctionalRun.yaml b/src/benchmarks/gc/GC.Infrastructure/Configurations/GCPerfSim/GCPerfSimFunctionalRun.yaml
@@ -5,14 +5,14 @@ coreruns:
   segments:
     path: C:\runtime_rc2\artifacts\tests\coreclr\windows.x64.Release\Tests\Core_Root\corerun.exe
     environment_variables:
-      COMPlus_GCName: clrgc.dll
+      DOTNET_GCName: clrgc.dll
   regions:
     path: C:\runtime_ga\artifacts\tests\coreclr\windows.x64.Release\Tests\Core_Root\corerun.exe
     environment_variables:
-      COMPlus_GCName: clrgcexp.dll
+      DOTNET_GCName: clrgcexp.dll
 
 environment:
   environment_variables:
-    COMPlus_GCServer: 1
+    DOTNET_gcServer: 1
 
 trace_configuration_type: none # Choose between: none, gc, verbose, cpu, cpu_managed, threadtime, join.
diff --git a/src/benchmarks/gc/GC.Infrastructure/Configurations/GCPerfSim/HighMemory.yaml b/src/benchmarks/gc/GC.Infrastructure/Configurations/GCPerfSim/HighMemory.yaml
@@ -10,7 +10,7 @@ runs:
       tlgb: 3 
       sohsi: 50
     environment_variables:
-      COMPlus_GCServer: 0
+      DOTNET_gcServer: 0
 
 # Top level microbenchmark configuration.
 gcperfsim_configurations:
@@ -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 
 

diff --git a/src/benchmarks/gc/GC.Infrastructure/Configurations/GCPerfSim/LargePages_NormalServer.yaml b/src/benchmarks/gc/GC.Infrastructure/Configurations/GCPerfSim/LargePages_NormalServer.yaml
@@ -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 
 

diff --git a/src/benchmarks/gc/GC.Infrastructure/Configurations/GCPerfSim/LargePages_Server.yaml b/src/benchmarks/gc/GC.Infrastructure/Configurations/GCPerfSim/LargePages_Server.yaml
@@ -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

diff --git a/src/benchmarks/gc/GC.Infrastructure/Configurations/GCPerfSim/LargePages_Workstation.yaml b/src/benchmarks/gc/GC.Infrastructure/Configurations/GCPerfSim/LargePages_Workstation.yaml
@@ -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

diff --git a/src/benchmarks/gc/GC.Infrastructure/Configurations/GCPerfSim/LowMemoryContainer.yaml b/src/benchmarks/gc/GC.Infrastructure/Configurations/GCPerfSim/LowMemoryContainer.yaml
@@ -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:
@@ -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 
 

diff --git a/src/benchmarks/gc/GC.Infrastructure/Configurations/GCPerfSim/LowVolatilityRuns.yaml b/src/benchmarks/gc/GC.Infrastructure/Configurations/GCPerfSim/LowVolatilityRuns.yaml
@@ -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\

diff --git a/src/benchmarks/gc/GC.Infrastructure/Configurations/GCPerfSim/Normal_Server.yaml b/src/benchmarks/gc/GC.Infrastructure/Configurations/GCPerfSim/Normal_Server.yaml
@@ -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_

diff --git a/src/benchmarks/gc/GC.Infrastructure/Configurations/GCPerfSim/Normal_Workstation.yaml b/src/benchmarks/gc/GC.Infrastructure/Configurations/GCPerfSim/Normal_Workstation.yaml
@@ -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

diff --git a/src/benchmarks/gc/GC.Infrastructure/Configurations/GCPerfSim/SampleCrank.yaml b/src/benchmarks/gc/GC.Infrastructure/Configurations/GCPerfSim/SampleCrank.yaml
@@ -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"
@@ -98,7 +98,7 @@ scenarios:
     application:
       job: gcperfsim
       environmentVariables:
-        COMPlus_GCServer: 1
+        DOTNET_gcServer: 1
       variables:
         threadCount: 1
 
@@ -116,6 +116,6 @@ scenarios:
     application:
       job: gcperfsim
       environmentVariables:
-        COMPlus_GCServer: 1
+        DOTNET_gcServer: 1
       variables:
         threadCount: 1
diff --git a/...benchmarks/gc/GC.Infrastructure/Configurations/Microbenchmark/Microbenchmarks_Server.yaml b/...benchmarks/gc/GC.Infrastructure/Configurations/Microbenchmark/Microbenchmarks_Server.yaml
@@ -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

diff --git a/...marks/gc/GC.Infrastructure/Configurations/Microbenchmark/Microbenchmarks_Workstation.yaml b/...marks/gc/GC.Infrastructure/Configurations/Microbenchmark/Microbenchmarks_Workstation.yaml
@@ -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

diff --git a/src/benchmarks/gc/GC.Infrastructure/Configurations/Run.yaml b/src/benchmarks/gc/GC.Infrastructure/Configurations/Run.yaml
@@ -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.
 

diff --git a/...ore.UnitTests/Microbenchmarks/Configurations/NoMicrobenchmarkConfigurationsSpecified.yaml b/...ore.UnitTests/Microbenchmarks/Configurations/NoMicrobenchmarkConfigurationsSpecified.yaml
@@ -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: