From 33fdd96d1e3bdf50774144b3e01017c8a348801f Mon Sep 17 00:00:00 2001 From: Kunal Pathak Date: Thu, 9 Jun 2022 14:53:46 -0700 Subject: [PATCH 1/3] fix jitdump --- src/coreclr/jit/emit.cpp | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/src/coreclr/jit/emit.cpp b/src/coreclr/jit/emit.cpp index ebd4f2120585af..47bcda91d344fe 100644 --- a/src/coreclr/jit/emit.cpp +++ b/src/coreclr/jit/emit.cpp @@ -3894,15 +3894,24 @@ void emitter::emitDispJumpList() unsigned int jmpCount = 0; for (instrDescJmp* jmp = emitJumpList; jmp != nullptr; jmp = jmp->idjNext) { +#if defined(TARGET_ARM64) + if ((jmp->idInsFmt() == IF_LARGEADR) || (jmp->idInsFmt() == IF_LARGELDC)) + { + printf("IG%02u IN%04x %3s[%u] -> %s\n", jmp->idjIG->igNum, jmp->idDebugOnlyInfo()->idNum, + codeGen->genInsDisplayName(jmp), jmp->idCodeSize(), getRegName(jmp->idReg1())); + } + else + { + printf("IG%02u IN%04x %3s[%u] -> IG%02u\n", jmp->idjIG->igNum, jmp->idDebugOnlyInfo()->idNum, + codeGen->genInsDisplayName(jmp), jmp->idCodeSize(), + ((insGroup*)emitCodeGetCookie(jmp->idAddr()->iiaBBlabel))->igNum); + } +#else printf("IG%02u IN%04x %3s[%u] -> IG%02u %s\n", jmp->idjIG->igNum, jmp->idDebugOnlyInfo()->idNum, codeGen->genInsDisplayName(jmp), jmp->idCodeSize(), ((insGroup*)emitCodeGetCookie(jmp->idAddr()->iiaBBlabel))->igNum, -#if defined(TARGET_XARCH) - jmp->idjIsRemovableJmpCandidate ? " ; removal candidate" : "" -#else - "" + jmp->idjIsRemovableJmpCandidate ? " ; removal candidate" : ""); #endif - ); jmpCount += 1; } printf(" total jump count: %u\n", jmpCount); From c5cdebfe7ea736d5df722b6804231c786cbc53a8 Mon Sep 17 00:00:00 2001 From: Kunal Pathak Date: Fri, 10 Jun 2022 07:05:46 -0700 Subject: [PATCH 2/3] Fix arm build --- src/coreclr/jit/emit.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/coreclr/jit/emit.cpp b/src/coreclr/jit/emit.cpp index 47bcda91d344fe..36d341c5773db2 100644 --- a/src/coreclr/jit/emit.cpp +++ b/src/coreclr/jit/emit.cpp @@ -3910,7 +3910,12 @@ void emitter::emitDispJumpList() printf("IG%02u IN%04x %3s[%u] -> IG%02u %s\n", jmp->idjIG->igNum, jmp->idDebugOnlyInfo()->idNum, codeGen->genInsDisplayName(jmp), jmp->idCodeSize(), ((insGroup*)emitCodeGetCookie(jmp->idAddr()->iiaBBlabel))->igNum, - jmp->idjIsRemovableJmpCandidate ? " ; removal candidate" : ""); +#if defined(TARGET_XARCH) + jmp->idjIsRemovableJmpCandidate ? " ; removal candidate" : "" +#else + "" +#endif + ); #endif jmpCount += 1; } From e7e0a62918873f80de1de8cd29175e8977bf7442 Mon Sep 17 00:00:00 2001 From: Kunal Pathak Date: Fri, 10 Jun 2022 12:28:04 -0700 Subject: [PATCH 3/3] Another format --- src/coreclr/jit/emit.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/coreclr/jit/emit.cpp b/src/coreclr/jit/emit.cpp index 36d341c5773db2..436565747f20b0 100644 --- a/src/coreclr/jit/emit.cpp +++ b/src/coreclr/jit/emit.cpp @@ -3915,7 +3915,7 @@ void emitter::emitDispJumpList() #else "" #endif - ); + ); #endif jmpCount += 1; }