tcg/riscv: Use SRAIW, SRLIW for {s}extract_i64

Extracts which abut bit 32 may use 32-bit shifts.

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson 2024-12-29 20:52:12 -08:00
parent 841e2c5257
commit fa65f13555
2 changed files with 19 additions and 21 deletions

View file

@ -112,31 +112,21 @@
static inline bool static inline bool
tcg_target_extract_valid(TCGType type, unsigned ofs, unsigned len) tcg_target_extract_valid(TCGType type, unsigned ofs, unsigned len)
{ {
if (ofs == 0) { if (type == TCG_TYPE_I64 && ofs + len == 32) {
switch (len) { /* ofs > 0 uses SRLIW; ofs == 0 uses add.uw. */
case 16: return ofs || (cpuinfo & CPUINFO_ZBA);
return cpuinfo & CPUINFO_ZBB;
case 32:
return (cpuinfo & CPUINFO_ZBA) && type == TCG_TYPE_I64;
} }
} return (cpuinfo & CPUINFO_ZBB) && ofs == 0 && len == 16;
return false;
} }
#define TCG_TARGET_extract_valid tcg_target_extract_valid #define TCG_TARGET_extract_valid tcg_target_extract_valid
static inline bool static inline bool
tcg_target_sextract_valid(TCGType type, unsigned ofs, unsigned len) tcg_target_sextract_valid(TCGType type, unsigned ofs, unsigned len)
{ {
if (ofs == 0) { if (type == TCG_TYPE_I64 && ofs + len == 32) {
switch (len) { return true;
case 8:
case 16:
return cpuinfo & CPUINFO_ZBB;
case 32:
return type == TCG_TYPE_I64;
} }
} return (cpuinfo & CPUINFO_ZBB) && ofs == 0 && (len == 8 || len == 16);
return false;
} }
#define TCG_TARGET_sextract_valid tcg_target_sextract_valid #define TCG_TARGET_sextract_valid tcg_target_sextract_valid

View file

@ -2344,8 +2344,12 @@ static void tcg_out_op(TCGContext *s, TCGOpcode opc, TCGType type,
break; break;
case INDEX_op_extract_i64: case INDEX_op_extract_i64:
if (a2 == 0 && args[3] == 32) { if (a2 + args[3] == 32) {
if (a2 == 0) {
tcg_out_ext32u(s, a0, a1); tcg_out_ext32u(s, a0, a1);
} else {
tcg_out_opc_imm(s, OPC_SRLIW, a0, a1, a2);
}
break; break;
} }
/* FALLTHRU */ /* FALLTHRU */
@ -2358,8 +2362,12 @@ static void tcg_out_op(TCGContext *s, TCGOpcode opc, TCGType type,
break; break;
case INDEX_op_sextract_i64: case INDEX_op_sextract_i64:
if (a2 == 0 && args[3] == 32) { if (a2 + args[3] == 32) {
if (a2 == 0) {
tcg_out_ext32s(s, a0, a1); tcg_out_ext32s(s, a0, a1);
} else {
tcg_out_opc_imm(s, OPC_SRAIW, a0, a1, a2);
}
break; break;
} }
/* FALLTHRU */ /* FALLTHRU */