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

Hexagon (target/hexagon) Mark has_pred_dest in trans functions

Browse Source 
Check that the value matches opcode_wregs

Signed-off-by: Taylor Simpson <ltaylorsimpson@gmail.com>
Reviewed-by: Brian Cain <bcain@quicinc.com>
Message-Id: <20240307032327.4799-5-ltaylorsimpson@gmail.com>
Signed-off-by: Brian Cain <bcain@quicinc.com>
This commit is contained in:
Taylor Simpson 2024-03-06 20:23:22 -07:00 committed by Brian Cain
parent 325a64af06
commit 4614b8f36a
3 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
target/hexagon/decode.c
View File

@ -366,6 +366,9 @@ static void decode_shuffle_for_execution(Packet *packet)
for (flag = false, i = 0; i < last_insn + 1; i++) { for (flag = false, i = 0; i < last_insn + 1; i++) {
int opcode = packet->insn[i].opcode; int opcode = packet->insn[i].opcode;
g_assert(packet->insn[i].has_pred_dest ==
(strstr(opcode_wregs[opcode], "Pd4") ||
strstr(opcode_wregs[opcode], "Pe4")));
if ((strstr(opcode_wregs[opcode], "Pd4") || if ((strstr(opcode_wregs[opcode], "Pd4") ||
strstr(opcode_wregs[opcode], "Pe4")) && strstr(opcode_wregs[opcode], "Pe4")) &&
GET_ATTRIB(opcode, A_STORE) == 0) { GET_ATTRIB(opcode, A_STORE) == 0) {

5
target/hexagon/gen_trans_funcs.py
View File

@ -70,6 +70,7 @@ def mark_which_imm_extended(f, tag):
## insn->regno[2] = args->Rt; ## insn->regno[2] = args->Rt;
## insn->new_read_idx = -1; ## insn->new_read_idx = -1;
## insn->dest_idx = 0; ## insn->dest_idx = 0;
## insn->has_pred_dest = false;
## return true; ## return true;
## } ## }
## ##
@ -88,6 +89,7 @@ def gen_trans_funcs(f):
new_read_idx = -1 new_read_idx = -1
dest_idx = -1 dest_idx = -1
has_pred_dest = "false"
for regno, (reg_type, reg_id, *_) in enumerate(regs): for regno, (reg_type, reg_id, *_) in enumerate(regs):
reg = hex_common.get_register(tag, reg_type, reg_id) reg = hex_common.get_register(tag, reg_type, reg_id)
f.write(code_fmt(f"""\ f.write(code_fmt(f"""\
@ -98,6 +100,8 @@ def gen_trans_funcs(f):
# dest_idx should be the first destination, so check for -1 # dest_idx should be the first destination, so check for -1
if reg.is_written() and dest_idx == -1: if reg.is_written() and dest_idx == -1:
dest_idx = regno dest_idx = regno
if reg_type == "P" and reg.is_written() and not reg.is_read():
has_pred_dest = "true"
if len(imms) != 0: if len(imms) != 0:
mark_which_imm_extended(f, tag) mark_which_imm_extended(f, tag)
@ -121,6 +125,7 @@ def gen_trans_funcs(f):
f.write(code_fmt(f"""\ f.write(code_fmt(f"""\
insn->new_read_idx = {new_read_idx}; insn->new_read_idx = {new_read_idx};
insn->dest_idx = {dest_idx}; insn->dest_idx = {dest_idx};
insn->has_pred_dest = {has_pred_dest};
""")) """))
f.write(textwrap.dedent(f"""\ f.write(textwrap.dedent(f"""\
return true; return true;

1
target/hexagon/insn.h
View File

@ -41,6 +41,7 @@ struct Instruction {
uint32_t new_value_producer_slot:4; uint32_t new_value_producer_slot:4;
int32_t new_read_idx; int32_t new_read_idx;
int32_t dest_idx; int32_t dest_idx;
bool has_pred_dest;
bool part1; /* bool part1; /*
* cmp-jumps are split into two insns. * cmp-jumps are split into two insns.