Skip to content

Commit 2b4c7b3

Browse files
BruceForstalljkotas
BruceForstall
and
jkotas
authored
Remove more ZapDisable/ZapRequire references (#98569)
* Remove more ZapDisable/ZapRequire references Follow-up to #96867 * Apply suggestions from code review Co-authored-by: Jan Kotas <[email protected]> --------- Co-authored-by: Jan Kotas <[email protected]>
1 parent 7457fe8 commit 2b4c7b3

File tree

12 files changed

+25
-43
lines changed

12 files changed

+25
-43
lines changed

‎eng/pipelines/common/templates/runtimes/run-test-job.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@ jobs:
389389
- jitstress1_tiered
390390
- jitstress2
391391
- jitstress2_tiered
392-
- zapdisable
392+
- disabler2r
393393
- tailcallstress
394394
${{ if in(parameters.testGroup, 'jitstress-random') }}:
395395
scenarios:
@@ -507,9 +507,9 @@ jobs:
507507
${{ if in(parameters.testGroup, 'gcstress-extra') }}:
508508
scenarios:
509509
- heapverify1
510-
- gcstress0xc_zapdisable
511-
- gcstress0xc_zapdisable_jitstress2
512-
- gcstress0xc_zapdisable_heapverify1
510+
- gcstress0xc_disabler2r
511+
- gcstress0xc_disabler2r_jitstress2
512+
- gcstress0xc_disabler2r_heapverify1
513513
- gcstress0xc_jitstress1
514514
- gcstress0xc_jitstress2
515515
- gcstress0xc_tailcallstress

‎eng/pipelines/libraries/run-test-job.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ jobs:
183183
- jitstress1_tiered
184184
- jitstress2
185185
- jitstress2_tiered
186-
- zapdisable
186+
- disabler2r
187187
- tailcallstress
188188
${{ if in(parameters.coreclrTestGroup, 'jitstress-random') }}:
189189
scenarios:
@@ -220,9 +220,9 @@ jobs:
220220
${{ if in(parameters.coreclrTestGroup, 'gcstress-extra') }}:
221221
scenarios:
222222
- heapverify1
223-
- gcstress0xc_zapdisable
224-
- gcstress0xc_zapdisable_jitstress2
225-
- gcstress0xc_zapdisable_heapverify1
223+
- gcstress0xc_disabler2r
224+
- gcstress0xc_disabler2r_jitstress2
225+
- gcstress0xc_disabler2r_heapverify1
226226
- gcstress0xc_jitstress1
227227
- gcstress0xc_jitstress2
228228
- gcstress0xc_jitminopts_heapverify1

‎src/coreclr/scripts/superpmi.py‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ def add_core_root_arguments(parser, build_type_default, build_type_help):
297297
collect_parser.add_argument("-output_mch_path", help="Location to place the final MCH file. Default is a constructed file name in the current directory.")
298298
collect_parser.add_argument("--merge_mch_files", action="store_true", help="Merge multiple MCH files. Use the -mch_files flag to pass a list of MCH files to merge.")
299299
collect_parser.add_argument("-mch_files", metavar="MCH_FILE", nargs='+', help="Pass a sequence of MCH files which will be merged. Required by --merge_mch_files.")
300-
collect_parser.add_argument("--use_zapdisable", action="store_true", help="Sets DOTNET_ZapDisable=1 and DOTNET_ReadyToRun=0 when doing collection to cause NGEN/ReadyToRun images to not be used, and thus causes JIT compilation and SuperPMI collection of these methods.")
300+
collect_parser.add_argument("--disable_r2r", action="store_true", help="Sets DOTNET_ReadyToRun=0 when doing collection to cause ReadyToRun images to not be used, and thus causes JIT compilation and SuperPMI collection of these methods.")
301301
collect_parser.add_argument("--tiered_compilation", action="store_true", help="Sets DOTNET_TieredCompilation=1 when doing collections.")
302302
collect_parser.add_argument("--tiered_pgo", action="store_true", help="Sets DOTNET_TieredCompilation=1 and DOTNET_TieredPGO=1 when doing collections.")
303303
collect_parser.add_argument("--ci", action="store_true", help="Special collection mode for handling zero-sized files in Azure DevOps + Helix pipelines collections.")
@@ -842,8 +842,7 @@ def __collect_mc_files__(self):
842842
else:
843843
dotnet_env["TieredCompilation"] = "0"
844844

845-
if self.coreclr_args.use_zapdisable:
846-
dotnet_env["ZapDisable"] = "1"
845+
if self.coreclr_args.disable_r2r:
847846
dotnet_env["ReadyToRun"] = "0"
848847

849848
logging.debug("Starting collection.")
@@ -4603,9 +4602,9 @@ def verify_base_diff_args():
46034602
"Unable to set clean.")
46044603

46054604
coreclr_args.verify(args,
4606-
"use_zapdisable",
4605+
"disable_r2r",
46074606
lambda unused: True,
4608-
"Unable to set use_zapdisable")
4607+
"Unable to set disable_r2r")
46094608

46104609
coreclr_args.verify(args,
46114610
"tiered_compilation",

‎src/libraries/sendtohelixhelp.proj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@
3131
'$(Scenario)' == 'gcstress0x3' or
3232
'$(Scenario)' == 'gcstress0xc' or
3333
'$(Scenario)' == 'heapverify1' or
34-
'$(Scenario)' == 'gcstress0xc_zapdisable' or
35-
'$(Scenario)' == 'gcstress0xc_zapdisable_jitstress2' or
36-
'$(Scenario)' == 'gcstress0xc_zapdisable_heapverify1' or
34+
'$(Scenario)' == 'gcstress0xc_disabler2r' or
35+
'$(Scenario)' == 'gcstress0xc_disabler2r_jitstress2' or
36+
'$(Scenario)' == 'gcstress0xc_disabler2r_heapverify1' or
3737
'$(Scenario)' == 'gcstress0xc_jitstress1' or
3838
'$(Scenario)' == 'gcstress0xc_jitstress2' or
3939
'$(Scenario)' == 'gcstress0xc_jitminopts_heapverify1'">06:00:00</_workItemTimeout>

‎src/tests/Common/CLRTest.CrossGen.targets‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -165,9 +165,6 @@ if [ ! -z ${RunCrossGen2+x} ]%3B then
165165
fi
166166
ReleaseLock
167167
fi
168-
169-
export DOTNET_ZapRequire=$(ZapRequire)
170-
export DOTNET_ZapRequireList=$(AssemblyName)
171168
fi
172169
]]>
173170
</CrossgenBashScript>
@@ -339,9 +336,6 @@ if defined RunCrossGen2 (
339336
ECHO R2RDump failed with exitcode - !R2RDumpStatus!
340337
Exit /b 1
341338
)
342-
343-
set DOTNET_ZapRequire=$(ZapRequire)
344-
set DOTNET_ZapRequireList=$(AssemblyName)
345339
)
346340
]]>
347341
</CrossgenBatchScript>

‎src/tests/Common/CoreCLRTestLibrary/CoreClrConfigurationDetection.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public static class CoreClrConfigurationDetection
1717
public static bool IsJitStressRegs => !string.Equals(GetEnvironmentVariableValue("JitStressRegs"), "0", StringComparison.InvariantCulture);
1818
public static bool IsJitMinOpts => string.Equals(GetEnvironmentVariableValue("JITMinOpts"), "1", StringComparison.InvariantCulture);
1919
public static bool IsTailCallStress => string.Equals(GetEnvironmentVariableValue("TailcallStress"), "1", StringComparison.InvariantCulture);
20-
public static bool IsZapDisable => string.Equals(GetEnvironmentVariableValue("ZapDisable"), "1", StringComparison.InvariantCulture);
20+
public static bool IsDisableR2R => string.Equals(GetEnvironmentVariableValue("ReadyToRun"), "0", StringComparison.InvariantCulture);
2121
public static bool IsGCStress3 => CompareGCStressModeAsLower(GetEnvironmentVariableValue("GCStress"), "0x3", "3");
2222
public static bool IsGCStressC => CompareGCStressModeAsLower(GetEnvironmentVariableValue("GCStress"), "0xC", "C");
2323

@@ -29,7 +29,7 @@ public static class CoreClrConfigurationDetection
2929

3030
public static bool IsStressTest =>
3131
IsGCStress ||
32-
IsZapDisable ||
32+
IsDisableR2R ||
3333
IsTailCallStress ||
3434
IsJitStressRegs ||
3535
IsJitStress ||

‎src/tests/Common/XUnitWrapperGenerator/RuntimeTestModes.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ public enum RuntimeTestModes
2222
JitMinOpts = 1 << 3, // DOTNET_JITMinOpts is set.
2323
TailcallStress = 1 << 4, // DOTNET_TailcallStress is set.
2424

25-
// ZapDisable says to not use NGEN or ReadyToRun images.
25+
// DisableR2R says to not use ReadyToRun images.
2626
// This means we JIT everything.
27-
ZapDisable = 1 << 5, // DOTNET_ZapDisable is set.
27+
DisableR2R = 1 << 5, // DOTNET_ReadyToRun=0
2828

2929
// GCStress3 forces a GC at various locations, typically transitions
3030
// to/from the VM from managed code.

‎src/tests/Common/XUnitWrapperGenerator/XUnitWrapperGenerator.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -908,9 +908,9 @@ private static ImmutableArray<ITestInfo> DecorateWithSkipOnCoreClrConfiguration(
908908
{
909909
conditions.Add($"!{ConditionClass}.IsTailcallStress");
910910
}
911-
if (skippedTestModes.HasFlag(Xunit.RuntimeTestModes.ZapDisable))
911+
if (skippedTestModes.HasFlag(Xunit.RuntimeTestModes.DisableR2R))
912912
{
913-
conditions.Add($"!{ConditionClass}.IsZapDisable");
913+
conditions.Add($"!{ConditionClass}.IsDisableR2R");
914914
}
915915

916916
if (skippedTestModes.HasFlag(Xunit.RuntimeTestModes.AnyGCStress))

‎src/tests/Common/testenvironment.proj‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@
5353
DOTNET_JitStressRegs;
5454
DOTNET_TailcallStress;
5555
DOTNET_ReadyToRun;
56-
DOTNET_ZapDisable;
5756
DOTNET_TC_OnStackReplacement;
5857
DOTNET_TC_QuickJitForLoops;
5958
DOTNET_TC_OnStackReplacement_InitialCounter;
@@ -207,11 +206,11 @@
207206
<TestEnvironment Include="gcstress0x3" GCStress="0x3" />
208207
<TestEnvironment Include="gcstress0xc" GCStress="0xC" />
209208
<TestEnvironment Include="gcstress0xf" GCStress="0xF" />
210-
<TestEnvironment Include="zapdisable" ZapDisable="1" ReadyToRun="0" />
209+
<TestEnvironment Include="disabler2r" ReadyToRun="0" />
211210
<TestEnvironment Include="heapverify1" HeapVerify="1" />
212-
<TestEnvironment Include="gcstress0xc_zapdisable" GCStress="0xC" ZapDisable="1" ReadyToRun="0" />
213-
<TestEnvironment Include="gcstress0xc_zapdisable_jitstress2" GCStress="0xC" ZapDisable="1" ReadyToRun="0" JitStress="2" />
214-
<TestEnvironment Include="gcstress0xc_zapdisable_heapverify1" GCStress="0xC" ZapDisable="1" ReadyToRun="0" HeapVerify="1" />
211+
<TestEnvironment Include="gcstress0xc_disabler2r" GCStress="0xC" ReadyToRun="0" />
212+
<TestEnvironment Include="gcstress0xc_disabler2r_jitstress2" GCStress="0xC" ReadyToRun="0" JitStress="2" />
213+
<TestEnvironment Include="gcstress0xc_disabler2r_heapverify1" GCStress="0xC" ReadyToRun="0" HeapVerify="1" />
215214
<TestEnvironment Include="gcstress0xc_jitstress1" GCStress="0xC" JitStress="1" />
216215
<TestEnvironment Include="gcstress0xc_jitstress2" GCStress="0xC" JitStress="2" />
217216
<TestEnvironment Include="gcstress0xc_tailcallstress" GCStress="0xC" TailcallStress="1" />

‎src/tests/Directory.Build.props‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -163,11 +163,6 @@
163163
<ExcludeMscorlibFacade>true</ExcludeMscorlibFacade>
164164
</PropertyGroup>
165165

166-
<!-- Set default ZapRequire level (used only when CrossGen is enabled) -->
167-
<PropertyGroup>
168-
<ZapRequire Condition="'$(ZapRequire)' == ''">2</ZapRequire>
169-
</PropertyGroup>
170-
171166
<!-- Don't append the RID to the output path for our test tree. Our test builds are already separated by RID
172167
and including the RID breaks some of our glob expressions in issues.targets -->
173168
<PropertyGroup>

0 commit comments

Comments
 (0)