Skip to content

Apply fixes for coreclr-interp on linux-riscv64 #127919

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
janvorli merged 4 commits into from
May 12, 2026
+43 −39
Merged

Apply fixes for coreclr-interp on linux-riscv64 #127919

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4c3850d
Pin riscv64 to rv64gc
am11 May 7, 2026
9298b7c
Change prolog offset direction
am11 May 7, 2026
d854592
Delete invalid assert
am11 May 7, 2026
6a688d1
Merge branch 'main' into patch-53
am11 May 7, 2026
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
5 changes: 5 additions & 0 deletions eng/native/configurecompiler.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -870,6 +870,11 @@ if(CLR_CMAKE_HOST_UNIX_ARMV6)
add_compile_options(-mfloat-abi=hard)
endif(CLR_CMAKE_HOST_UNIX_ARMV6)

if(CLR_CMAKE_HOST_UNIX_RISCV64)
add_compile_options(-march=rv64gc)
add_compile_options(-mabi=lp64d)
endif(CLR_CMAKE_HOST_UNIX_RISCV64)

if(CLR_CMAKE_HOST_UNIX_X86)
add_compile_options(-msse2)
endif()
Expand Down
1 change: 0 additions & 1 deletion src/coreclr/vm/callstubgenerator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2888,7 +2888,6 @@ CallStubGenerator::ReturnType CallStubGenerator::GetReturnType(ArgIteratorType *
else
{
_ASSERTE(info.flags == FpStruct::UseIntCallConv);
_ASSERTE(thReturnValueType.AsMethodTable()->IsRegPassedStruct());
unsigned size = thReturnValueType.GetSize();
if (size <= 8)
{
Expand Down
76 changes: 38 additions & 38 deletions src/coreclr/vm/riscv64/asmhelpers.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1081,7 +1081,7 @@ Load_Ref A7, a7
// a3 - stack arguments size (properly aligned)
// a4 - address of continuation return value
NESTED_ENTRY CallJittedMethodRetVoid, _TEXT, NoHandler
PROLOG_SAVE_REG_PAIR_INDEXED fp, ra, -32
PROLOG_SAVE_REG_PAIR_INDEXED fp, ra, 32
sd a4, 16(fp)
sub sp, sp, a3
mv t2, a0
Expand All @@ -1102,7 +1102,7 @@ NESTED_END CallJittedMethodRetVoid, _TEXT
// a3 - stack arguments size (properly aligned)
// a4 - address of continuation return value
NESTED_ENTRY CallJittedMethodRetBuff, _TEXT, NoHandler
PROLOG_SAVE_REG_PAIR_INDEXED fp, ra, -32
PROLOG_SAVE_REG_PAIR_INDEXED fp, ra, 32
sd a4, 16(fp)
sub sp, sp, a3
mv t2, a0
Expand All @@ -1124,7 +1124,7 @@ NESTED_END CallJittedMethodRetBuff, _TEXT
// a3 - stack arguments size (properly aligned)
// a4 - address of continuation return value
NESTED_ENTRY CallJittedMethodRetI1, _TEXT, NoHandler
PROLOG_SAVE_REG_PAIR_INDEXED fp, ra, -32
PROLOG_SAVE_REG_PAIR_INDEXED fp, ra, 32
sd a2, 16(fp)
sd a4, 24(fp)
sub sp, sp, a3
Expand All @@ -1150,7 +1150,7 @@ NESTED_END CallJittedMethodRetI1, _TEXT
// a3 - stack arguments size (properly aligned)
// a4 - address of continuation return value
NESTED_ENTRY CallJittedMethodRetI2, _TEXT, NoHandler
PROLOG_SAVE_REG_PAIR_INDEXED fp, ra, -32
PROLOG_SAVE_REG_PAIR_INDEXED fp, ra, 32
sd a2, 16(fp)
sd a4, 24(fp)
sub sp, sp, a3
Expand All @@ -1176,7 +1176,7 @@ NESTED_END CallJittedMethodRetI2, _TEXT
// a3 - stack arguments size (properly aligned)
// a4 - address of continuation return value
NESTED_ENTRY CallJittedMethodRetU1, _TEXT, NoHandler
PROLOG_SAVE_REG_PAIR_INDEXED fp, ra, -32
PROLOG_SAVE_REG_PAIR_INDEXED fp, ra, 32
sd a2, 16(fp)
sd a4, 24(fp)
sub sp, sp, a3
Expand All @@ -1202,7 +1202,7 @@ NESTED_END CallJittedMethodRetU1, _TEXT
// a3 - stack arguments size (properly aligned)
// a4 - address of continuation return value
NESTED_ENTRY CallJittedMethodRetU2, _TEXT, NoHandler
PROLOG_SAVE_REG_PAIR_INDEXED fp, ra, -32
PROLOG_SAVE_REG_PAIR_INDEXED fp, ra, 32
sd a2, 16(fp)
sd a4, 24(fp)
sub sp, sp, a3
Expand All @@ -1228,7 +1228,7 @@ NESTED_END CallJittedMethodRetU2, _TEXT
// a3 - stack arguments size (properly aligned)
// a4 - address of continuation return value
NESTED_ENTRY CallJittedMethodRetI8, _TEXT, NoHandler
PROLOG_SAVE_REG_PAIR_INDEXED fp, ra, -32
PROLOG_SAVE_REG_PAIR_INDEXED fp, ra, 32
sd a2, 16(fp)
sd a4, 24(fp)
sub sp, sp, a3
Expand All @@ -1252,7 +1252,7 @@ NESTED_END CallJittedMethodRetI8, _TEXT
// a3 - stack arguments size (properly aligned)
// a4 - address of continuation return value
NESTED_ENTRY CallJittedMethodRetDouble, _TEXT, NoHandler
PROLOG_SAVE_REG_PAIR_INDEXED fp, ra, -32
PROLOG_SAVE_REG_PAIR_INDEXED fp, ra, 32
sd a2, 16(fp)
sd a4, 24(fp)
sub sp, sp, a3
Expand All @@ -1276,7 +1276,7 @@ NESTED_END CallJittedMethodRetDouble, _TEXT
// a3 - stack arguments size (properly aligned)
// a4 - address of continuation return value
NESTED_ENTRY CallJittedMethodRetFloat, _TEXT, NoHandler
PROLOG_SAVE_REG_PAIR_INDEXED fp, ra, -32
PROLOG_SAVE_REG_PAIR_INDEXED fp, ra, 32
sd a2, 16(fp)
sd a4, 24(fp)
sub sp, sp, a3
Expand All @@ -1300,7 +1300,7 @@ NESTED_END CallJittedMethodRetFloat, _TEXT
// a3 - stack arguments size (properly aligned)
// a4 - address of continuation return value
NESTED_ENTRY CallJittedMethodRet2I8, _TEXT, NoHandler
PROLOG_SAVE_REG_PAIR_INDEXED fp, ra, -32
PROLOG_SAVE_REG_PAIR_INDEXED fp, ra, 32
sd a2, 16(fp)
sd a4, 24(fp)
sub sp, sp, a3
Expand All @@ -1325,7 +1325,7 @@ NESTED_END CallJittedMethodRet2I8, _TEXT
// a3 - stack arguments size (properly aligned)
// a4 - address of continuation return value
NESTED_ENTRY CallJittedMethodRet2Double, _TEXT, NoHandler
PROLOG_SAVE_REG_PAIR_INDEXED fp, ra, -32
PROLOG_SAVE_REG_PAIR_INDEXED fp, ra, 32
sd a2, 16(fp)
sd a4, 24(fp)
sub sp, sp, a3
Expand All @@ -1350,7 +1350,7 @@ NESTED_END CallJittedMethodRet2Double, _TEXT
// a3 - stack arguments size (properly aligned)
// a4 - address of continuation return value
NESTED_ENTRY CallJittedMethodRet2Float, _TEXT, NoHandler
PROLOG_SAVE_REG_PAIR_INDEXED fp, ra, -32
PROLOG_SAVE_REG_PAIR_INDEXED fp, ra, 32
sd a2, 16(fp)
sd a4, 24(fp)
sub sp, sp, a3
Expand All @@ -1375,7 +1375,7 @@ NESTED_END CallJittedMethodRet2Float, _TEXT
// a3 - stack arguments size (properly aligned)
// a4 - address of continuation return value
NESTED_ENTRY CallJittedMethodRetFloatInt, _TEXT, NoHandler
PROLOG_SAVE_REG_PAIR_INDEXED fp, ra, -32
PROLOG_SAVE_REG_PAIR_INDEXED fp, ra, 32
sd a2, 16(fp)
sd a4, 24(fp)
sub sp, sp, a3
Expand All @@ -1400,7 +1400,7 @@ NESTED_END CallJittedMethodRetFloatInt, _TEXT
// a3 - stack arguments size (properly aligned)
// a4 - address of continuation return value
NESTED_ENTRY CallJittedMethodRetIntFloat, _TEXT, NoHandler
PROLOG_SAVE_REG_PAIR_INDEXED fp, ra, -32
PROLOG_SAVE_REG_PAIR_INDEXED fp, ra, 32
sd a2, 16(fp)
sd a4, 24(fp)
sub sp, sp, a3
Expand All @@ -1424,7 +1424,7 @@ NESTED_ENTRY InterpreterStub, _TEXT, NoHandler
PROLOG_WITH_TRANSITION_BLOCK pushCalleeSavedFloatRegs=1

// IR bytecode address
mv t6, METHODDESC_REGISTER
mv s1, METHODDESC_REGISTER

INLINE_GETTHREAD t5 // thrashes a0
beqz t5, LOCAL_LABEL(NoManagedThreadOrCallStub)
Expand All @@ -1436,7 +1436,7 @@ NESTED_ENTRY InterpreterStub, _TEXT, NoHandler

LOCAL_LABEL(NoManagedThreadOrCallStub):
addi a0, sp, __PWTB_TransitionBlock
mv a1, t6
mv a1, s1
call C_FUNC(GetInterpThreadContextWithPossiblyMissingThreadOrCallStub)
mv t4, a0

Expand All @@ -1445,12 +1445,12 @@ LOCAL_LABEL(HaveInterpThreadContext):
RESTORE_ARGUMENT_REGISTERS sp, __PWTB_ArgumentRegisters
RESTORE_FLOAT_ARGUMENT_REGISTERS sp, __PWTB_FloatArgumentRegisters

ld t3, 0(t6) // InterpMethod*
ld t3, 0(s1) // InterpMethod*
ld t3, OFFSETOF__InterpMethod__pCallStub(t3)
beqz t3, LOCAL_LABEL(NoManagedThreadOrCallStub)
addi t2, t3, OFFSETOF__CallStubHeader__Routines
ld t3, OFFSETOF__InterpThreadContext__pStackPointer(t4)
// t6 contains IR bytecode address
// s1 contains IR bytecode address
// Copy the arguments to the interpreter stack, invoke the InterpExecMethod and load the return value
ld t4, 0(t2)
addi t2, t2, 8
Expand All @@ -1463,21 +1463,21 @@ LOCAL_LABEL(HaveInterpThreadContext):
NESTED_END InterpreterStub, _TEXT

NESTED_ENTRY InterpreterStubRetVoid, _TEXT, NoHandler
PROLOG_SAVE_REG_PAIR_INDEXED fp, ra, -16
PROLOG_SAVE_REG_PAIR_INDEXED fp, ra, 16
// The +16 is for the fp, ra above
addi a0, sp, __PWTB_TransitionBlock + 16
mv a1, t6 // the IR bytecode pointer
mv a1, s1 // the IR bytecode pointer
mv a2, zero
call C_FUNC(ExecuteInterpretedMethod)
EPILOG_RESTORE_REG_PAIR_INDEXED fp, ra, 16
EPILOG_RETURN
NESTED_END InterpreterStubRetVoid, _TEXT

NESTED_ENTRY InterpreterStubRetI8, _TEXT, NoHandler
PROLOG_SAVE_REG_PAIR_INDEXED fp, ra, -16
PROLOG_SAVE_REG_PAIR_INDEXED fp, ra, 16
// The +16 is for the fp, ra above
addi a0, sp, __PWTB_TransitionBlock + 16
mv a1, t6 // the IR bytecode pointer
mv a1, s1 // the IR bytecode pointer
mv a2, zero
call C_FUNC(ExecuteInterpretedMethod)
ld a0, 0(a0)
Expand All @@ -1486,10 +1486,10 @@ NESTED_ENTRY InterpreterStubRetI8, _TEXT, NoHandler
NESTED_END InterpreterStubRetI8, _TEXT

NESTED_ENTRY InterpreterStubRetDouble, _TEXT, NoHandler
PROLOG_SAVE_REG_PAIR_INDEXED fp, ra, -16
PROLOG_SAVE_REG_PAIR_INDEXED fp, ra, 16
// The +16 is for the fp, ra above
addi a0, sp, __PWTB_TransitionBlock + 16
mv a1, t6 // the IR bytecode pointer
mv a1, s1 // the IR bytecode pointer
mv a2, zero
call C_FUNC(ExecuteInterpretedMethod)
fld fa0, 0(a0)
Expand All @@ -1498,21 +1498,21 @@ NESTED_ENTRY InterpreterStubRetDouble, _TEXT, NoHandler
NESTED_END InterpreterStubRetDouble, _TEXT

NESTED_ENTRY InterpreterStubRetBuff, _TEXT, NoHandler
PROLOG_SAVE_REG_PAIR_INDEXED fp, ra, -16
PROLOG_SAVE_REG_PAIR_INDEXED fp, ra, 16
// The +16 is for the fp, ra above
mv a2, a0 // save caller's return buffer in a2
addi a0, sp, __PWTB_TransitionBlock + 16
mv a1, t6 // the IR bytecode pointer (x19)
mv a1, s1 // the IR bytecode pointer
call C_FUNC(ExecuteInterpretedMethod)
EPILOG_RESTORE_REG_PAIR_INDEXED fp, ra, 16
EPILOG_RETURN
NESTED_END InterpreterStubRetBuff, _TEXT

NESTED_ENTRY InterpreterStubRet2I8, _TEXT, NoHandler
PROLOG_SAVE_REG_PAIR_INDEXED fp, ra, -16
PROLOG_SAVE_REG_PAIR_INDEXED fp, ra, 16
// The +16 is for the fp, ra above
addi a0, sp, __PWTB_TransitionBlock + 16
mv a1, t6 // the IR bytecode pointer
mv a1, s1 // the IR bytecode pointer
mv a2, zero
call C_FUNC(ExecuteInterpretedMethod)
ld a1, 8(a0)
Expand All @@ -1522,10 +1522,10 @@ NESTED_ENTRY InterpreterStubRet2I8, _TEXT, NoHandler
NESTED_END InterpreterStubRet2I8, _TEXT

NESTED_ENTRY InterpreterStubRet2Double, _TEXT, NoHandler
PROLOG_SAVE_REG_PAIR_INDEXED fp, ra, -16
PROLOG_SAVE_REG_PAIR_INDEXED fp, ra, 16
// The +16 is for the fp, ra above
addi a0, sp, __PWTB_TransitionBlock + 16
mv a1, t6 // the IR bytecode pointer
mv a1, s1 // the IR bytecode pointer
mv a2, zero
call C_FUNC(ExecuteInterpretedMethod)
fld fa0, 0(a0)
Expand All @@ -1535,10 +1535,10 @@ NESTED_ENTRY InterpreterStubRet2Double, _TEXT, NoHandler
NESTED_END InterpreterStubRet2Double, _TEXT

NESTED_ENTRY InterpreterStubRetFloat, _TEXT, NoHandler
PROLOG_SAVE_REG_PAIR_INDEXED fp, ra, -16
PROLOG_SAVE_REG_PAIR_INDEXED fp, ra, 16
// The +16 is for the fp, ra above
addi a0, sp, __PWTB_TransitionBlock + 16
mv a1, t6 // the IR bytecode pointer
mv a1, s1 // the IR bytecode pointer
mv a2, zero
call C_FUNC(ExecuteInterpretedMethod)
flw fa0, 0(a0)
Expand All @@ -1547,10 +1547,10 @@ NESTED_ENTRY InterpreterStubRetFloat, _TEXT, NoHandler
NESTED_END InterpreterStubRetFloat, _TEXT

NESTED_ENTRY InterpreterStubRet2Float, _TEXT, NoHandler
PROLOG_SAVE_REG_PAIR_INDEXED fp, ra, -16
PROLOG_SAVE_REG_PAIR_INDEXED fp, ra, 16
// The +16 is for the fp, ra above
addi a0, sp, __PWTB_TransitionBlock + 16
mv a1, t6 // the IR bytecode pointer
mv a1, s1 // the IR bytecode pointer
mv a2, zero
call C_FUNC(ExecuteInterpretedMethod)
flw fa0, 0(a0)
Expand All @@ -1560,10 +1560,10 @@ NESTED_ENTRY InterpreterStubRet2Float, _TEXT, NoHandler
NESTED_END InterpreterStubRet2Float, _TEXT

NESTED_ENTRY InterpreterStubRetFloatInt, _TEXT, NoHandler
PROLOG_SAVE_REG_PAIR_INDEXED fp, ra, -16
PROLOG_SAVE_REG_PAIR_INDEXED fp, ra, 16
// The +16 is for the fp, ra above
addi a0, sp, __PWTB_TransitionBlock + 16
mv a1, t6 // the IR bytecode pointer
mv a1, s1 // the IR bytecode pointer
mv a2, zero
call C_FUNC(ExecuteInterpretedMethod)
fld fa0, 0(a0)
Expand All @@ -1573,10 +1573,10 @@ NESTED_ENTRY InterpreterStubRetFloatInt, _TEXT, NoHandler
NESTED_END InterpreterStubRetFloatInt, _TEXT

NESTED_ENTRY InterpreterStubRetIntFloat, _TEXT, NoHandler
PROLOG_SAVE_REG_PAIR_INDEXED fp, ra, -16
PROLOG_SAVE_REG_PAIR_INDEXED fp, ra, 16
// The +16 is for the fp, ra above
addi a0, sp, __PWTB_TransitionBlock + 16
mv a1, t6 // the IR bytecode pointer
mv a1, s1 // the IR bytecode pointer
mv a2, zero
call C_FUNC(ExecuteInterpretedMethod)
ld a1, 0(a0)
Expand Down