Skip to content

Commit

Permalink
Rename references of protononjit to clrjit_ (#42133)
Browse files Browse the repository at this point in the history
* wip: rename protononjit

* Rename protononjit to clrjit_

* revert changes in run-pmi-diffs.py

* revert superpmi.py changes

* fix variable name
  • Loading branch information
kunalspathak committed Sep 29, 2020
1 parent 38bf4df commit 855e296
Show file tree
Hide file tree
Showing 7 changed files with 26 additions and 59 deletions.
2 changes: 1 addition & 1 deletion src/coreclr/scripts/superpmi.py
Original file line number Diff line number Diff line change
Expand Up @@ -3158,4 +3158,4 @@ def main(args):

if __name__ == "__main__":
args = parser.parse_args()
sys.exit(main(args))
sys.exit(main(args))
3 changes: 1 addition & 2 deletions src/coreclr/src/jit/gentree.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,7 @@ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
// Debugging GenTree is much easier if we add a magic virtual function to make the debugger able to figure out what type
// it's got. This is enabled by default in DEBUG. To enable it in RET builds (temporarily!), you need to change the
// build to define DEBUGGABLE_GENTREE=1, as well as pass /OPT:NOICF to the linker (or else all the vtables get merged,
// making the debugging value supplied by them useless). See protojit.nativeproj for a commented example of setting the
// build flags correctly.
// making the debugging value supplied by them useless).
#ifndef DEBUGGABLE_GENTREE
#ifdef DEBUG
#define DEBUGGABLE_GENTREE 1
Expand Down
22 changes: 21 additions & 1 deletion src/coreclr/src/zap/zapper.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -620,7 +620,27 @@ void Zapper::InitEE(BOOL fForceDebug, BOOL fForceProfile, BOOL fForceInstrument)

if (altName == NULL)
{
altName = MAKEDLLNAME_W(W("protojit"));
#ifdef TARGET_WINDOWS
#ifdef TARGET_X86
altName = MAKEDLLNAME_W(W("clrjit_win_x86_x86"));
#elif defined(TARGET_AMD64)
altName = MAKEDLLNAME_W(W("clrjit_win_x64_x64"));
#elif defined(TARGET_ARM)
altName = MAKEDLLNAME_W(W("clrjit_win_arm_arm"));
#elif defined(TARGET_ARM64)
altName = MAKEDLLNAME_W(W("clrjit_win_arm64_arm64"));
#endif
#else // TARGET_WINDOWS
#ifdef TARGET_X86
altName = MAKEDLLNAME_W(W("clrjit_unix_x86_x86"));
#elif defined(TARGET_AMD64)
altName = MAKEDLLNAME_W(W("clrjit_unix_x64_x64"));
#elif defined(TARGET_ARM)
altName = MAKEDLLNAME_W(W("clrjit_unix_arm_arm"));
#elif defined(TARGET_ARM64)
altName = MAKEDLLNAME_W(W("clrjit_unix_arm64_arm64"));
#endif
#endif // TARGET_WINDOWS
}

LoadAndInitializeJITForNgen(altName, &m_hAltJITCompiler, &m_alternateJit);
Expand Down
52 changes: 0 additions & 52 deletions src/coreclr/tests/protononjit_testenv.cmd

This file was deleted.

2 changes: 1 addition & 1 deletion src/coreclr/tests/x64_arm64_altjit.cmd
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
set COMPlus_AltJit=*
set COMPlus_AltJitNgen=*
set COMPlus_AltJitName=protononjit.dll
set COMPlus_AltJitName=clrjit_win_arm64_x64.dll
set COMPlus_NoGuiOnAssert=1
set COMPlus_ContinueOnAssert=0
set COMPlus_AltJitAssertOnNYI=1
Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/tests/x86_arm_altjit.cmd
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
set COMPlus_AltJit=*
set COMPlus_AltJitNgen=*
set COMPlus_AltJitName=protononjit.dll
set COMPlus_AltJitName=clrjit_win_arm_x86.dll
set COMPlus_NoGuiOnAssert=1
set COMPlus_ContinueOnAssert=0
set COMPlus_AltJitAssertOnNYI=1
2 changes: 1 addition & 1 deletion src/tests/Common/Directory.Build.targets
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<RunTimeArtifactsExcludeFiles Include="PDB/mscordaccore.pdb" />
<RunTimeArtifactsExcludeFiles Include="PDB/mscordbi.pdb" />
<RunTimeArtifactsExcludeFiles Include="PDB/mscorrc.pdb" />
<RunTimeArtifactsExcludeFiles Include="PDB/protononjit.pdb" />
<RunTimeArtifactsExcludeFiles Include="PDB/clrjit_*.pdb" />
<RunTimeArtifactsExcludeFiles Include="PDB/superpmi.pdb" />
<RunTimeArtifactsExcludeFiles Include="PDB/superpmi-shim-collector.pdb" />
<RunTimeArtifactsExcludeFiles Include="PDB/superpmi-shim-counter.pdb" />
Expand Down

0 comments on commit 855e296

Please sign in to comment.