mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

target/hexagon: Use tcg_constant_*

Browse Source 
Replace uses of tcg_const_* with the allocate and free close together.

Inspired-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Taylor Simpson <tsimpson@quicinc.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20211003004750.3608983-3-f4bug@amsat.org>
This commit is contained in:
Philippe Mathieu-Daudé 2021-10-03 02:47:50 +02:00 committed by Taylor Simpson
parent f844f745a8
commit 23803bbe52
5 changed files with 25 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
target/hexagon/gen_tcg.h
View File

@ -684,9 +684,8 @@
gen_helper_sfmin(RdV, cpu_env, RsV, RtV) gen_helper_sfmin(RdV, cpu_env, RsV, RtV)
#define fGEN_TCG_F2_sfclass(SHORTCODE) \ #define fGEN_TCG_F2_sfclass(SHORTCODE) \
do { \ do { \
TCGv imm = tcg_const_tl(uiV); \ TCGv imm = tcg_constant_tl(uiV); \
gen_helper_sfclass(PdV, cpu_env, RsV, imm); \ gen_helper_sfclass(PdV, cpu_env, RsV, imm); \
tcg_temp_free(imm); \
} while (0) } while (0)
#define fGEN_TCG_F2_sffixupn(SHORTCODE) \ #define fGEN_TCG_F2_sffixupn(SHORTCODE) \
gen_helper_sffixupn(RdV, cpu_env, RsV, RtV) gen_helper_sffixupn(RdV, cpu_env, RsV, RtV)
@ -712,9 +711,8 @@
gen_helper_dfcmpuo(PdV, cpu_env, RssV, RttV) gen_helper_dfcmpuo(PdV, cpu_env, RssV, RttV)
#define fGEN_TCG_F2_dfclass(SHORTCODE) \ #define fGEN_TCG_F2_dfclass(SHORTCODE) \
do { \ do { \
TCGv imm = tcg_const_tl(uiV); \ TCGv imm = tcg_constant_tl(uiV); \
gen_helper_dfclass(PdV, cpu_env, RssV, imm); \ gen_helper_dfclass(PdV, cpu_env, RssV, imm); \
tcg_temp_free(imm); \
} while (0) } while (0)
#define fGEN_TCG_F2_sfmpy(SHORTCODE) \ #define fGEN_TCG_F2_sfmpy(SHORTCODE) \
gen_helper_sfmpy(RdV, cpu_env, RsV, RtV) gen_helper_sfmpy(RdV, cpu_env, RsV, RtV)

4
target/hexagon/gen_tcg_funcs.py
View File

@ -403,7 +403,7 @@ def gen_tcg_func(f, tag, regs, imms):
if hex_common.need_part1(tag): if hex_common.need_part1(tag):
f.write(" TCGv part1 = tcg_const_tl(insn->part1);\n") f.write(" TCGv part1 = tcg_const_tl(insn->part1);\n")
if hex_common.need_slot(tag): if hex_common.need_slot(tag):
f.write(" TCGv slot = tcg_const_tl(insn->slot);\n") f.write(" TCGv slot = tcg_constant_tl(insn->slot);\n")
f.write(" gen_helper_%s(" % (tag)) f.write(" gen_helper_%s(" % (tag))
i=0 i=0
## If there is a scalar result, it is the return type ## If there is a scalar result, it is the return type
@ -424,8 +424,6 @@ def gen_tcg_func(f, tag, regs, imms):
if hex_common.need_slot(tag): f.write(", slot") if hex_common.need_slot(tag): f.write(", slot")
if hex_common.need_part1(tag): f.write(", part1" ) if hex_common.need_part1(tag): f.write(", part1" )
f.write(");\n") f.write(");\n")
if hex_common.need_slot(tag):
f.write(" tcg_temp_free(slot);\n")
if hex_common.need_part1(tag): if hex_common.need_part1(tag):
f.write(" tcg_temp_free(part1);\n") f.write(" tcg_temp_free(part1);\n")
for immlett,bits,immshift in imms: for immlett,bits,immshift in imms:

39
target/hexagon/genptr.c
View File

@ -29,7 +29,7 @@
static inline void gen_log_predicated_reg_write(int rnum, TCGv val, int slot) static inline void gen_log_predicated_reg_write(int rnum, TCGv val, int slot)
{ {
TCGv zero = tcg_const_tl(0); TCGv zero = tcg_constant_tl(0);
TCGv slot_mask = tcg_temp_new(); TCGv slot_mask = tcg_temp_new();
tcg_gen_andi_tl(slot_mask, hex_slot_cancelled, 1 << slot); tcg_gen_andi_tl(slot_mask, hex_slot_cancelled, 1 << slot);
@ -47,7 +47,6 @@ static inline void gen_log_predicated_reg_write(int rnum, TCGv val, int slot)
tcg_gen_or_tl(hex_reg_written[rnum], hex_reg_written[rnum], slot_mask); tcg_gen_or_tl(hex_reg_written[rnum], hex_reg_written[rnum], slot_mask);
} }
tcg_temp_free(zero);
tcg_temp_free(slot_mask); tcg_temp_free(slot_mask);
} }
@ -63,7 +62,7 @@ static inline void gen_log_reg_write(int rnum, TCGv val)
static void gen_log_predicated_reg_write_pair(int rnum, TCGv_i64 val, int slot) static void gen_log_predicated_reg_write_pair(int rnum, TCGv_i64 val, int slot)
{ {
TCGv val32 = tcg_temp_new(); TCGv val32 = tcg_temp_new();
TCGv zero = tcg_const_tl(0); TCGv zero = tcg_constant_tl(0);
TCGv slot_mask = tcg_temp_new(); TCGv slot_mask = tcg_temp_new();
tcg_gen_andi_tl(slot_mask, hex_slot_cancelled, 1 << slot); tcg_gen_andi_tl(slot_mask, hex_slot_cancelled, 1 << slot);
@ -92,7 +91,6 @@ static void gen_log_predicated_reg_write_pair(int rnum, TCGv_i64 val, int slot)
} }
tcg_temp_free(val32); tcg_temp_free(val32);
tcg_temp_free(zero);
tcg_temp_free(slot_mask); tcg_temp_free(slot_mask);
} }
@ -181,9 +179,8 @@ static inline void gen_read_ctrl_reg_pair(DisasContext *ctx, const int reg_num,
tcg_gen_concat_i32_i64(dest, p3_0, hex_gpr[reg_num + 1]); tcg_gen_concat_i32_i64(dest, p3_0, hex_gpr[reg_num + 1]);
tcg_temp_free(p3_0); tcg_temp_free(p3_0);
} else if (reg_num == HEX_REG_PC - 1) { } else if (reg_num == HEX_REG_PC - 1) {
TCGv pc = tcg_const_tl(ctx->base.pc_next); TCGv pc = tcg_constant_tl(ctx->base.pc_next);
tcg_gen_concat_i32_i64(dest, hex_gpr[reg_num], pc); tcg_gen_concat_i32_i64(dest, hex_gpr[reg_num], pc);
tcg_temp_free(pc);
} else if (reg_num == HEX_REG_QEMU_PKT_CNT) { } else if (reg_num == HEX_REG_QEMU_PKT_CNT) {
TCGv pkt_cnt = tcg_temp_new(); TCGv pkt_cnt = tcg_temp_new();
TCGv insn_cnt = tcg_temp_new(); TCGv insn_cnt = tcg_temp_new();
@ -331,15 +328,13 @@ static inline void gen_store_conditional4(DisasContext *ctx,
tcg_gen_brcond_tl(TCG_COND_NE, vaddr, hex_llsc_addr, fail); tcg_gen_brcond_tl(TCG_COND_NE, vaddr, hex_llsc_addr, fail);
one = tcg_const_tl(0xff); one = tcg_constant_tl(0xff);
zero = tcg_const_tl(0); zero = tcg_constant_tl(0);
tmp = tcg_temp_new(); tmp = tcg_temp_new();
tcg_gen_atomic_cmpxchg_tl(tmp, hex_llsc_addr, hex_llsc_val, src, tcg_gen_atomic_cmpxchg_tl(tmp, hex_llsc_addr, hex_llsc_val, src,
ctx->mem_idx, MO_32); ctx->mem_idx, MO_32);
tcg_gen_movcond_tl(TCG_COND_EQ, pred, tmp, hex_llsc_val, tcg_gen_movcond_tl(TCG_COND_EQ, pred, tmp, hex_llsc_val,
one, zero); one, zero);
tcg_temp_free(one);
tcg_temp_free(zero);
tcg_temp_free(tmp); tcg_temp_free(tmp);
tcg_gen_br(done); tcg_gen_br(done);
@ -359,16 +354,14 @@ static inline void gen_store_conditional8(DisasContext *ctx,
tcg_gen_brcond_tl(TCG_COND_NE, vaddr, hex_llsc_addr, fail); tcg_gen_brcond_tl(TCG_COND_NE, vaddr, hex_llsc_addr, fail);
one = tcg_const_i64(0xff); one = tcg_constant_i64(0xff);
zero = tcg_const_i64(0); zero = tcg_constant_i64(0);
tmp = tcg_temp_new_i64(); tmp = tcg_temp_new_i64();
tcg_gen_atomic_cmpxchg_i64(tmp, hex_llsc_addr, hex_llsc_val_i64, src, tcg_gen_atomic_cmpxchg_i64(tmp, hex_llsc_addr, hex_llsc_val_i64, src,
ctx->mem_idx, MO_64); ctx->mem_idx, MO_64);
tcg_gen_movcond_i64(TCG_COND_EQ, tmp, tmp, hex_llsc_val_i64, tcg_gen_movcond_i64(TCG_COND_EQ, tmp, tmp, hex_llsc_val_i64,
one, zero); one, zero);
tcg_gen_extrl_i64_i32(pred, tmp); tcg_gen_extrl_i64_i32(pred, tmp);
tcg_temp_free_i64(one);
tcg_temp_free_i64(zero);
tcg_temp_free_i64(tmp); tcg_temp_free_i64(tmp);
tcg_gen_br(done); tcg_gen_br(done);
@ -396,9 +389,8 @@ static inline void gen_store1(TCGv_env cpu_env, TCGv vaddr, TCGv src,
static inline void gen_store1i(TCGv_env cpu_env, TCGv vaddr, int32_t src, static inline void gen_store1i(TCGv_env cpu_env, TCGv vaddr, int32_t src,
DisasContext *ctx, int slot) DisasContext *ctx, int slot)
{ {
TCGv tmp = tcg_const_tl(src); TCGv tmp = tcg_constant_tl(src);
gen_store1(cpu_env, vaddr, tmp, ctx, slot); gen_store1(cpu_env, vaddr, tmp, ctx, slot);
tcg_temp_free(tmp);
} }
static inline void gen_store2(TCGv_env cpu_env, TCGv vaddr, TCGv src, static inline void gen_store2(TCGv_env cpu_env, TCGv vaddr, TCGv src,
@ -411,9 +403,8 @@ static inline void gen_store2(TCGv_env cpu_env, TCGv vaddr, TCGv src,
static inline void gen_store2i(TCGv_env cpu_env, TCGv vaddr, int32_t src, static inline void gen_store2i(TCGv_env cpu_env, TCGv vaddr, int32_t src,
DisasContext *ctx, int slot) DisasContext *ctx, int slot)
{ {
TCGv tmp = tcg_const_tl(src); TCGv tmp = tcg_constant_tl(src);
gen_store2(cpu_env, vaddr, tmp, ctx, slot); gen_store2(cpu_env, vaddr, tmp, ctx, slot);
tcg_temp_free(tmp);
} }
static inline void gen_store4(TCGv_env cpu_env, TCGv vaddr, TCGv src, static inline void gen_store4(TCGv_env cpu_env, TCGv vaddr, TCGv src,
@ -426,9 +417,8 @@ static inline void gen_store4(TCGv_env cpu_env, TCGv vaddr, TCGv src,
static inline void gen_store4i(TCGv_env cpu_env, TCGv vaddr, int32_t src, static inline void gen_store4i(TCGv_env cpu_env, TCGv vaddr, int32_t src,
DisasContext *ctx, int slot) DisasContext *ctx, int slot)
{ {
TCGv tmp = tcg_const_tl(src); TCGv tmp = tcg_constant_tl(src);
gen_store4(cpu_env, vaddr, tmp, ctx, slot); gen_store4(cpu_env, vaddr, tmp, ctx, slot);
tcg_temp_free(tmp);
} }
static inline void gen_store8(TCGv_env cpu_env, TCGv vaddr, TCGv_i64 src, static inline void gen_store8(TCGv_env cpu_env, TCGv vaddr, TCGv_i64 src,
@ -443,18 +433,15 @@ static inline void gen_store8(TCGv_env cpu_env, TCGv vaddr, TCGv_i64 src,
static inline void gen_store8i(TCGv_env cpu_env, TCGv vaddr, int64_t src, static inline void gen_store8i(TCGv_env cpu_env, TCGv vaddr, int64_t src,
DisasContext *ctx, int slot) DisasContext *ctx, int slot)
{ {
TCGv_i64 tmp = tcg_const_i64(src); TCGv_i64 tmp = tcg_constant_i64(src);
gen_store8(cpu_env, vaddr, tmp, ctx, slot); gen_store8(cpu_env, vaddr, tmp, ctx, slot);
tcg_temp_free_i64(tmp);
} }
static TCGv gen_8bitsof(TCGv result, TCGv value) static TCGv gen_8bitsof(TCGv result, TCGv value)
{ {
TCGv zero = tcg_const_tl(0); TCGv zero = tcg_constant_tl(0);
TCGv ones = tcg_const_tl(0xff); TCGv ones = tcg_constant_tl(0xff);
tcg_gen_movcond_tl(TCG_COND_NE, result, value, zero, ones, zero); tcg_gen_movcond_tl(TCG_COND_NE, result, value, zero, ones, zero);
tcg_temp_free(zero);
tcg_temp_free(ones);
return result; return result;
} }

3
target/hexagon/macros.h
View File

@ -189,14 +189,13 @@ static inline void gen_pred_cancel(TCGv pred, int slot_num)
{ {
TCGv slot_mask = tcg_const_tl(1 << slot_num); TCGv slot_mask = tcg_const_tl(1 << slot_num);
TCGv tmp = tcg_temp_new(); TCGv tmp = tcg_temp_new();
TCGv zero = tcg_const_tl(0); TCGv zero = tcg_constant_tl(0);
tcg_gen_or_tl(slot_mask, hex_slot_cancelled, slot_mask); tcg_gen_or_tl(slot_mask, hex_slot_cancelled, slot_mask);
tcg_gen_andi_tl(tmp, pred, 1); tcg_gen_andi_tl(tmp, pred, 1);
tcg_gen_movcond_tl(TCG_COND_EQ, hex_slot_cancelled, tmp, zero, tcg_gen_movcond_tl(TCG_COND_EQ, hex_slot_cancelled, tmp, zero,
slot_mask, hex_slot_cancelled); slot_mask, hex_slot_cancelled);
tcg_temp_free(slot_mask); tcg_temp_free(slot_mask);
tcg_temp_free(tmp); tcg_temp_free(tmp);
tcg_temp_free(zero);
} }
#define PRED_LOAD_CANCEL(PRED, EA) \ #define PRED_LOAD_CANCEL(PRED, EA) \
gen_pred_cancel(PRED, insn->is_endloop ? 4 : insn->slot) gen_pred_cancel(PRED, insn->is_endloop ? 4 : insn->slot)

26
target/hexagon/translate.c
View File

@ -54,9 +54,7 @@ static const char * const hexagon_prednames[] = {
static void gen_exception_raw(int excp) static void gen_exception_raw(int excp)
{ {
TCGv_i32 helper_tmp = tcg_const_i32(excp); gen_helper_raise_exception(cpu_env, tcg_constant_i32(excp));
gen_helper_raise_exception(cpu_env, helper_tmp);
tcg_temp_free_i32(helper_tmp);
} }
static void gen_exec_counters(DisasContext *ctx) static void gen_exec_counters(DisasContext *ctx)
@ -288,7 +286,7 @@ static void gen_pred_writes(DisasContext *ctx, Packet *pkt)
* write of the predicates. * write of the predicates.
*/ */
if (pkt->pkt_has_endloop) { if (pkt->pkt_has_endloop) {
TCGv zero = tcg_const_tl(0); TCGv zero = tcg_constant_tl(0);
TCGv pred_written = tcg_temp_new(); TCGv pred_written = tcg_temp_new();
for (i = 0; i < ctx->preg_log_idx; i++) { for (i = 0; i < ctx->preg_log_idx; i++) {
int pred_num = ctx->preg_log[i]; int pred_num = ctx->preg_log[i];
@ -299,7 +297,6 @@ static void gen_pred_writes(DisasContext *ctx, Packet *pkt)
hex_new_pred_value[pred_num], hex_new_pred_value[pred_num],
hex_pred[pred_num]); hex_pred[pred_num]);
} }
tcg_temp_free(zero);
tcg_temp_free(pred_written); tcg_temp_free(pred_written);
} else { } else {
for (i = 0; i < ctx->preg_log_idx; i++) { for (i = 0; i < ctx->preg_log_idx; i++) {
@ -317,11 +314,9 @@ static void gen_pred_writes(DisasContext *ctx, Packet *pkt)
static void gen_check_store_width(DisasContext *ctx, int slot_num) static void gen_check_store_width(DisasContext *ctx, int slot_num)
{ {
if (HEX_DEBUG) { if (HEX_DEBUG) {
TCGv slot = tcg_const_tl(slot_num); TCGv slot = tcg_constant_tl(slot_num);
TCGv check = tcg_const_tl(ctx->store_width[slot_num]); TCGv check = tcg_constant_tl(ctx->store_width[slot_num]);
gen_helper_debug_check_store_width(cpu_env, slot, check); gen_helper_debug_check_store_width(cpu_env, slot, check);
tcg_temp_free(slot);
tcg_temp_free(check);
} }
} }
@ -403,9 +398,8 @@ void process_store(DisasContext *ctx, Packet *pkt, int slot_num)
* TCG generation time, we'll use a helper to * TCG generation time, we'll use a helper to
* avoid branching based on the width at runtime. * avoid branching based on the width at runtime.
*/ */
TCGv slot = tcg_const_tl(slot_num); TCGv slot = tcg_constant_tl(slot_num);
gen_helper_commit_store(cpu_env, slot); gen_helper_commit_store(cpu_env, slot);
tcg_temp_free(slot);
} }
} }
tcg_temp_free(address); tcg_temp_free(address);
@ -436,7 +430,7 @@ static void process_dczeroa(DisasContext *ctx, Packet *pkt)
if (pkt->pkt_has_dczeroa) { if (pkt->pkt_has_dczeroa) {
/* Store 32 bytes of zero starting at (addr & ~0x1f) */ /* Store 32 bytes of zero starting at (addr & ~0x1f) */
TCGv addr = tcg_temp_new(); TCGv addr = tcg_temp_new();
TCGv_i64 zero = tcg_const_i64(0); TCGv_i64 zero = tcg_constant_i64(0);
tcg_gen_andi_tl(addr, hex_dczero_addr, ~0x1f); tcg_gen_andi_tl(addr, hex_dczero_addr, ~0x1f);
tcg_gen_qemu_st64(zero, addr, ctx->mem_idx); tcg_gen_qemu_st64(zero, addr, ctx->mem_idx);
@ -448,7 +442,6 @@ static void process_dczeroa(DisasContext *ctx, Packet *pkt)
tcg_gen_qemu_st64(zero, addr, ctx->mem_idx); tcg_gen_qemu_st64(zero, addr, ctx->mem_idx);
tcg_temp_free(addr); tcg_temp_free(addr);
tcg_temp_free_i64(zero);
} }
} }
@ -510,15 +503,12 @@ static void gen_commit_packet(DisasContext *ctx, Packet *pkt)
update_exec_counters(ctx, pkt); update_exec_counters(ctx, pkt);
if (HEX_DEBUG) { if (HEX_DEBUG) {
TCGv has_st0 = TCGv has_st0 =
tcg_const_tl(pkt->pkt_has_store_s0 && !pkt->pkt_has_dczeroa); tcg_constant_tl(pkt->pkt_has_store_s0 && !pkt->pkt_has_dczeroa);
TCGv has_st1 = TCGv has_st1 =
tcg_const_tl(pkt->pkt_has_store_s1 && !pkt->pkt_has_dczeroa); tcg_constant_tl(pkt->pkt_has_store_s1 && !pkt->pkt_has_dczeroa);
/* Handy place to set a breakpoint at the end of execution */ /* Handy place to set a breakpoint at the end of execution */
gen_helper_debug_commit_end(cpu_env, has_st0, has_st1); gen_helper_debug_commit_end(cpu_env, has_st0, has_st1);
tcg_temp_free(has_st0);
tcg_temp_free(has_st1);
} }
if (pkt->pkt_has_cof) { if (pkt->pkt_has_cof) {