From 5492b198b35deff632ae282c36d910db1d886302 Mon Sep 17 00:00:00 2001 From: monstercatss Date: Thu, 22 Feb 2024 16:46:13 +0800 Subject: [PATCH 1/2] [RISC-V] Use getUnrollThreshold() to get unroll limits --- src/coreclr/jit/codegenriscv64.cpp | 4 ++-- src/coreclr/jit/compiler.h | 1 + src/coreclr/jit/lowerriscv64.cpp | 8 +++++--- src/coreclr/jit/targetriscv64.h | 2 -- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/coreclr/jit/codegenriscv64.cpp b/src/coreclr/jit/codegenriscv64.cpp index 6dc76478246be0..788653b99f6127 100644 --- a/src/coreclr/jit/codegenriscv64.cpp +++ b/src/coreclr/jit/codegenriscv64.cpp @@ -2512,7 +2512,7 @@ void CodeGen::genCodeForDivMod(GenTreeOp* tree) // Generate code for InitBlk by performing a loop unroll // Preconditions: // a) Both the size and fill byte value are integer constants. -// b) The size of the struct to initialize is smaller than INITBLK_UNROLL_LIMIT bytes. +// b) The size of the struct to initialize is smaller than getUnrollThreshold() bytes. void CodeGen::genCodeForInitBlkUnroll(GenTreeBlk* node) { assert(node->OperIs(GT_STORE_BLK)); @@ -6177,7 +6177,7 @@ void CodeGen::genCodeForIndir(GenTreeIndir* tree) // None // // Assumption: -// The size argument of the CpBlk node is a constant and <= CPBLK_UNROLL_LIMIT bytes. +// The size argument of the CpBlk node is a constant and <= getUnrollThreshold() bytes. // void CodeGen::genCodeForCpBlkUnroll(GenTreeBlk* cpBlkNode) { diff --git a/src/coreclr/jit/compiler.h b/src/coreclr/jit/compiler.h index c8d7fe49b62a01..a42832a4d80be0 100644 --- a/src/coreclr/jit/compiler.h +++ b/src/coreclr/jit/compiler.h @@ -9211,6 +9211,7 @@ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX // | arm64 | 256 | 128 | ldp/stp (2x128bit) // | arm | 32 | 16 | no SIMD support // | loongarch64 | 64 | 32 | no SIMD support + // | riscv64 | 64 | 32 | no SIMD support // // We might want to use a different multiplier for truly hot/cold blocks based on PGO data // diff --git a/src/coreclr/jit/lowerriscv64.cpp b/src/coreclr/jit/lowerriscv64.cpp index 405b9707c41145..52b1bad02d5a91 100644 --- a/src/coreclr/jit/lowerriscv64.cpp +++ b/src/coreclr/jit/lowerriscv64.cpp @@ -245,7 +245,8 @@ void Lowering::LowerBlockStore(GenTreeBlk* blkNode) src = src->AsUnOp()->gtGetOp1(); } - if (!blkNode->OperIs(GT_STORE_DYN_BLK) && (size <= INITBLK_UNROLL_LIMIT) && src->OperIs(GT_CNS_INT)) + if (!blkNode->OperIs(GT_STORE_DYN_BLK) && (size <= comp->getUnrollThreshold(Compiler::UnrollKind::Memset)) && + src->OperIs(GT_CNS_INT)) { blkNode->gtBlkOpKind = GenTreeBlk::BlkOpKindUnroll; @@ -300,8 +301,9 @@ void Lowering::LowerBlockStore(GenTreeBlk* blkNode) ClassLayout* layout = blkNode->GetLayout(); bool doCpObj = !blkNode->OperIs(GT_STORE_DYN_BLK) && layout->HasGCPtr(); + unsigned copyBlockUnrollLimit = comp->getUnrollThreshold(Compiler::UnrollKind::Memcpy); - if (doCpObj && (size <= CPBLK_UNROLL_LIMIT)) + if (doCpObj && (size <= copyBlockUnrollLimit)) { // No write barriers are needed on the stack. // If the layout contains a byref, then we know it must live on the stack. @@ -321,7 +323,7 @@ void Lowering::LowerBlockStore(GenTreeBlk* blkNode) assert((dstAddr->TypeGet() == TYP_BYREF) || (dstAddr->TypeGet() == TYP_I_IMPL)); blkNode->gtBlkOpKind = GenTreeBlk::BlkOpKindCpObjUnroll; } - else if (blkNode->OperIs(GT_STORE_BLK) && (size <= CPBLK_UNROLL_LIMIT)) + else if (blkNode->OperIs(GT_STORE_BLK) && (size <= copyBlockUnrollLimit)) { blkNode->gtBlkOpKind = GenTreeBlk::BlkOpKindUnroll; diff --git a/src/coreclr/jit/targetriscv64.h b/src/coreclr/jit/targetriscv64.h index 9cf0185a569351..5ac82fa9a00974 100644 --- a/src/coreclr/jit/targetriscv64.h +++ b/src/coreclr/jit/targetriscv64.h @@ -12,8 +12,6 @@ #define ROUND_FLOAT 0 // Do not round intermed float expression results #define CPU_HAS_BYTE_REGS 0 - #define CPBLK_UNROLL_LIMIT 64 // Upper bound to let the code generator to loop unroll CpBlk - #define INITBLK_UNROLL_LIMIT 64 // Upper bound to let the code generator to loop unroll InitBlk #ifdef FEATURE_SIMD #pragma error("SIMD Unimplemented yet RISCV64") From 321b134bb9a6abb90138c8485dc49e87a1c083c6 Mon Sep 17 00:00:00 2001 From: monstercatss Date: Thu, 22 Feb 2024 17:06:14 +0800 Subject: [PATCH 2/2] Modify formatting --- src/coreclr/jit/lowerriscv64.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/coreclr/jit/lowerriscv64.cpp b/src/coreclr/jit/lowerriscv64.cpp index 52b1bad02d5a91..75d19b7a941d8e 100644 --- a/src/coreclr/jit/lowerriscv64.cpp +++ b/src/coreclr/jit/lowerriscv64.cpp @@ -299,9 +299,9 @@ void Lowering::LowerBlockStore(GenTreeBlk* blkNode) comp->lvaSetVarDoNotEnregister(srcLclNum DEBUGARG(DoNotEnregisterReason::BlockOp)); } - ClassLayout* layout = blkNode->GetLayout(); - bool doCpObj = !blkNode->OperIs(GT_STORE_DYN_BLK) && layout->HasGCPtr(); - unsigned copyBlockUnrollLimit = comp->getUnrollThreshold(Compiler::UnrollKind::Memcpy); + ClassLayout* layout = blkNode->GetLayout(); + bool doCpObj = !blkNode->OperIs(GT_STORE_DYN_BLK) && layout->HasGCPtr(); + unsigned copyBlockUnrollLimit = comp->getUnrollThreshold(Compiler::UnrollKind::Memcpy); if (doCpObj && (size <= copyBlockUnrollLimit)) {