[RISC-V] Fix GitHub_* tests#88640
Conversation
src/coreclr/jit/codegenriscv64.cpp
Outdated
| var_types loadType = TYP_UNDEF; | ||
|
|
||
| // NOTE for RISCV64: not supports the HFA. | ||
| assert(!varDsc->lvIsHfaRegArg()); |
There was a problem hiding this comment.
HFA is ARM only concept. I think this assert isn't needed.
| gcInfo.gcMarkRegPtrVal(argReg, loadType); | ||
|
|
||
| if (compiler->lvaIsMultiregStruct(varDsc, compiler->info.compIsVarArgs)) | ||
| if (varDsc->GetOtherArgReg() < REG_STK) |
There was a problem hiding this comment.
It's code from LA64, when I made genJmpMethod() implementation, I've took ARM64 version since it's more clear. E.g. what's the meaning of if (varDsc->GetOtherArgReg() < REG_STK)?
There was a problem hiding this comment.
Because ARM64 and RISCV have different calling convention. Right, ARM64 seems more clearer, but RISCV follows LA64's. So we need to update like LA64.
GetOtherArgReg is the second register for multi argument register for RISCV and LA64.
In case of ARM64 in the test, it passes two float register arguments using one int register (REG_A0). So compiler->lvaIsMultiregStruct returns false. In method prolog in a callee, it makes two float values from REG_A0 in ARM64.
| argRegNext = genRegArgNext(argReg); | ||
| argRegNext = varDsc->GetOtherArgReg(); | ||
|
|
||
| if (emitter::isFloatReg(argRegNext)) |
There was a problem hiding this comment.
And why special case for float is need?
There was a problem hiding this comment.
Because it cannot get the exact type by using varDsc->GetLayout()->GetGCPtrType(1) (only returns TYP_I_IMPL for all primitive and non-gc value type) and GetEmitter()->emitIns_R_S needs the exact type for the arguments.
If you want to update calling convention like ARM64, we can do. However, I think it is better to investigate after RISC-V is stable.
|
@jkotas @jakobbotsch Could you please review? Thank you so much. |
jkotas
left a comment
There was a problem hiding this comment.
The virtualcallstubcpu.hpp change looks good.
@jakobbotsch Could you please review the JIT change?
genJmpMethodincodegenriscv64.cppPart of #84834
cc @wscho77 @HJLeee @JongHeonChoi @t-mustafin @alpencolt @gbalykov