Skip to content

[RISC-V] Fix bug in label printing in disasm #96136

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

Merged
jakobbotsch merged 12 commits into from
Jan 10, 2024
Merged

[RISC-V] Fix bug in label printing in disasm #96136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
593009b
Bugfix
Dec 18, 2023
c238b82
Fixed comparation sign
Dec 18, 2023
c5f212a
Revert "Fixed comparation sign"
Dec 18, 2023
f9adbef
Fixed comparation sign
Dec 18, 2023
661aeba
Reverted changes in emitOutputInstrJumpDistanceHelper
Dec 18, 2023
6a8dffa
Fixed misspell
Dec 18, 2023
9e095a5
Fixes after review
Dec 18, 2023
bdf0489
Reverted changes from la
Dec 20, 2023
c1a0c4a
Fixed format bug
Dec 20, 2023
50f99d3
Fixed comment
Dec 20, 2023
95cd76a
Merge branch 'main' into riscv-encoded-ins-quickfix
Bajtazar Jan 9, 2024
8e57b1f
Merge branch 'main' into riscv-encoded-ins-quickfix
Bajtazar Jan 10, 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
24 changes: 20 additions & 4 deletions src/coreclr/jit/emit.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -936,7 +936,7 @@ class emitter
// TODO-Cleanup: We should really add a DEBUG-only tag to this union so we can add asserts
// about reading what we think is here, to avoid unexpected corruption issues.

#if !defined(TARGET_ARM64) && !defined(TARGET_LOONGARCH64) && !defined(TARGET_RISCV64)
#if !defined(TARGET_ARM64) && !defined(TARGET_LOONGARCH64)
emitLclVarAddr iiaLclVar;
#endif
BasicBlock* iiaBBlabel;
Expand Down Expand Up @@ -990,7 +990,7 @@ class emitter
regNumber _idReg3 : REGNUM_BITS;
regNumber _idReg4 : REGNUM_BITS;
};
#elif defined(TARGET_LOONGARCH64) || defined(TARGET_RISCV64)
#elif defined(TARGET_LOONGARCH64)
struct
{
unsigned int iiaEncodedInstr; // instruction's binary encoding.
Expand Down Expand Up @@ -1021,7 +1021,23 @@ class emitter
{
return iiaJmpOffset;
}
#endif // defined(TARGET_LOONGARCH64) || defined(TARGET_RISCV64)
#elif defined(TARGET_RISCV64)
struct
{
regNumber _idReg3 : REGNUM_BITS;
regNumber _idReg4 : REGNUM_BITS;
unsigned int iiaEncodedInstr; // instruction's binary encoding.
};

void iiaSetInstrEncode(unsigned int encode)
{
iiaEncodedInstr = encode;
}
unsigned int iiaGetInstrEncode() const
{
return iiaEncodedInstr;
}
#endif // defined(TARGET_RISCV64)

} _idAddrUnion;

Expand Down Expand Up @@ -1123,7 +1139,7 @@ class emitter
}

#elif defined(TARGET_LOONGARCH64)
unsigned idCodeSize() const
unsigned idCodeSize() const
{
return _idCodeSize;
}
Expand Down
31 changes: 20 additions & 11 deletions src/coreclr/jit/emitriscv64.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -659,7 +659,9 @@ void emitter::emitIns_R_R(
void emitter::emitIns_R_R_I(
instruction ins, emitAttr attr, regNumber reg1, regNumber reg2, ssize_t imm, insOpts opt /* = INS_OPTS_NONE */)
{
code_t code = emitInsCode(ins);
code_t code = emitInsCode(ins);
instrDesc* id = emitNewInstr(attr);

if ((INS_addi <= ins && INS_srai >= ins) || (INS_addiw <= ins && INS_sraiw >= ins) ||
(INS_lb <= ins && INS_lhu >= ins) || INS_ld == ins || INS_lw == ins || INS_jalr == ins || INS_fld == ins ||
INS_flw == ins)
Expand Down Expand Up @@ -688,6 +690,8 @@ void emitter::emitIns_R_R_I(
code |= ((imm >> 1) & 0xf) << 8;
code |= ((imm >> 5) & 0x3f) << 25;
code |= ((imm >> 12) & 0x1) << 31;
// TODO-RISCV64: Move jump logic to emitIns_J
id->idAddr()->iiaSetInstrCount(imm / sizeof(code_t));
}
else if (ins == INS_csrrs || ins == INS_csrrw || ins == INS_csrrc)
{
Expand All @@ -702,7 +706,6 @@ void emitter::emitIns_R_R_I(
{
NYI_RISCV64("illegal ins within emitIns_R_R_I!");
}
instrDesc* id = emitNewInstr(attr);

id->idIns(ins);
id->idReg1(reg1);
Expand Down Expand Up @@ -2124,8 +2127,8 @@ void emitter::emitOutputInstrJumpDistanceHelper(const insGroup* ig,
UNATIVE_OFFSET& dstOffs,
const BYTE*& dstAddr) const
{
// TODO-RISCV64-BUG: iiaEncodedInstrCount is not set by the riscv impl making distinguishing the jumps to label and
// an instruction-count based jumps impossible
// TODO-RISCV64-BUG: Currently the iiaEncodedInstrCount is not set by the riscv impl making distinguishing the jump
// to label and an instruction-count based jumps impossible
if (jmp->idAddr()->iiaHasInstrCount())
{
assert(ig != nullptr);
Expand All @@ -2136,7 +2139,7 @@ void emitter::emitOutputInstrJumpDistanceHelper(const insGroup* ig,
// Backward branches using instruction count must be within the same instruction group.
assert(insNum + 1 >= static_cast<unsigned>(-instrCount));
}
dstOffs = ig->igOffs + emitFindOffset(ig, (insNum + 1 + instrCount));
dstOffs = ig->igOffs + emitFindOffset(ig, insNum + 1 + instrCount);
dstAddr = emitOffsetToPtr(dstOffs);
return;
}
Expand Down Expand Up @@ -2989,19 +2992,25 @@ bool emitter::emitDispBranchInstrType(unsigned opcode2) const

void emitter::emitDispBranchOffset(const instrDesc* id, const insGroup* ig) const
{
static const auto signFn = [](int offset) { return offset >= 0 ? "+" : ""; };

int instrCount = id->idAddr()->iiaGetInstrCount();
if (ig == nullptr)
{
printf("pc%s%d instructions", signFn(instrCount), instrCount);
printf("pc%+d instructions", instrCount);
return;
}
unsigned insNum = emitFindInsNum(ig, id);
unsigned insNum = emitFindInsNum(ig, id);

if (ig->igInsCnt < insNum + 1 + instrCount)
{
// TODO-RISCV64-BUG: This should be a labeled offset but does not contain an iiaIGlabel
printf("pc%+d instructions", instrCount);
return;
}

UNATIVE_OFFSET srcOffs = ig->igOffs + emitFindOffset(ig, insNum + 1);
UNATIVE_OFFSET dstOffs = ig->igOffs + emitFindOffset(ig, insNum + 1 + instrCount);
ssize_t relOffs = static_cast<ssize_t>(emitOffsetToPtr(dstOffs) - emitOffsetToPtr(dstOffs));
printf("pc%s%d (%d instructions)", signFn(relOffs), static_cast<int>(relOffs), instrCount);
ssize_t relOffs = static_cast<ssize_t>(emitOffsetToPtr(dstOffs) - emitOffsetToPtr(srcOffs));
printf("pc%+d (%d instructions)", static_cast<int>(relOffs), instrCount);
}

void emitter::emitDispBranchLabel(const instrDesc* id) const
Expand Down