Signed-off-by: Taylor Simpson <tsimp...@quicinc.com>
---
target/hexagon/decode.c | 23 +-
target/hexagon/mmvec/decode_ext_mmvec.c | 673 ++++++++++++++++++++++++++++++++
target/hexagon/mmvec/decode_ext_mmvec.h | 24 ++
target/hexagon/q6v_decode.c | 14 +
4 files changed, 732 insertions(+), 2 deletions(-)
create mode 100644 target/hexagon/mmvec/decode_ext_mmvec.c
create mode 100644 target/hexagon/mmvec/decode_ext_mmvec.h
diff --git a/target/hexagon/decode.c b/target/hexagon/decode.c
index 4d74a25..8c3667c 100644
--- a/target/hexagon/decode.c
+++ b/target/hexagon/decode.c
@@ -28,6 +28,8 @@
#include "insn.h"
#include "macros.h"
#include "printinsn.h"
+#include "mmvec/mmvec.h"
+#include "mmvec/decode_ext_mmvec.h"
enum {
EXT_IDX_noext = 0,
@@ -152,6 +154,9 @@ static void decode_ext_init(void)
for (i = EXT_IDX_noext; i < EXT_IDX_noext_AFTER; i++) {
ext_trees[i] = &dectree_table_DECODE_EXT_EXT_noext;
}
+ for (i = EXT_IDX_mmvec; i < EXT_IDX_mmvec_AFTER; i++) {
+ ext_trees[i] = &dectree_table_DECODE_EXT_EXT_mmvec;
+ }
}
typedef struct {
@@ -449,6 +454,9 @@ static int decode_set_insn_attr_fields(packet_t *pkt)
if (GET_ATTRIB(opcode, A_STORE)) {
pkt->insn[i].is_store = 1;
+ if (GET_ATTRIB(opcode, A_VMEM)) {
+ pkt->insn[i].is_vmem_st = 1;
+ }
if (pkt->insn[i].slot == 0) {
pkt->pkt_has_store_s0 = 1;
@@ -461,6 +469,9 @@ static int decode_set_insn_attr_fields(packet_t *pkt)
}
if (GET_ATTRIB(opcode, A_LOAD)) {
pkt->insn[i].is_load = 1;
+ if (GET_ATTRIB(opcode, A_VMEM)) {
+ pkt->insn[i].is_vmem_ld = 1;
+ }
if (pkt->insn[i].slot == 0) {
pkt->pkt_has_load_s0 = 1;
@@ -468,6 +479,10 @@ static int decode_set_insn_attr_fields(packet_t *pkt)
pkt->pkt_has_load_s1 = 1;
}
}
+ if (GET_ATTRIB(opcode, A_CVI_GATHER) ||
+ GET_ATTRIB(opcode, A_CVI_SCATTER)) {
+ pkt->insn[i].is_scatgath = 1;
+ }
if (GET_ATTRIB(opcode, A_MEMOP)) {
pkt->insn[i].is_memop = 1;
}
@@ -741,8 +756,12 @@ static int decode_remove_extenders(packet_t *packet)
static const char *
get_valid_slot_str(const packet_t *pkt, unsigned int slot)
{
- return find_iclass_slots(pkt->insn[slot].opcode,
- pkt->insn[slot].iclass);
+ if (GET_ATTRIB(pkt->insn[slot].opcode, A_EXTENSION)) {
+ return mmvec_ext_decode_find_iclass_slots(pkt->insn[slot].opcode);
+ } else {
+ return find_iclass_slots(pkt->insn[slot].opcode,
+ pkt->insn[slot].iclass);
+ }
}
#include "q6v_decode.c"
diff --git a/target/hexagon/mmvec/decode_ext_mmvec.c
b/target/hexagon/mmvec/decode_ext_mmvec.c
new file mode 100644
index 0000000..f723041
--- /dev/null
+++ b/target/hexagon/mmvec/decode_ext_mmvec.c
@@ -0,0 +1,673 @@
+/*
+ * Copyright (c) 2019 Qualcomm Innovation Center, Inc. All Rights Reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "qemu/osdep.h"
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include "decode.h"
+#include "opcodes.h"
+#include "insn.h"
+#include "printinsn.h"
+#include "mmvec/mmvec.h"
+#include "mmvec/decode_ext_mmvec.h"
+
+typedef enum hvx_resource {
+ HVX_RESOURCE_LOAD = 0,
+ HVX_RESOURCE_STORE = 1,
+ HVX_RESOURCE_PERM = 2,
+ HVX_RESOURCE_SHIFT = 3,
+ HVX_RESOURCE_MPY0 = 4,
+ HVX_RESOURCE_MPY1 = 5,
+ HVX_RESOURCE_ZR = 6,
+ HVX_RESOURCE_ZW = 7
+} hvx_resource_t;
+
+#define FREE 1
+#define USED 0
+
+static int
+check_dv_instruction(hvx_resource_t *resources, int *ilist,
+ int num_insn, packet_t *packet, unsigned int attribute,
+ hvx_resource_t resource0, hvx_resource_t resource1)
+{
+
+ int current_insn = 0;
+ /* Loop on vector instruction count */
+ for (current_insn = 0; current_insn < num_insn; current_insn++) {
+ /* valid instruction */
+ if (ilist[current_insn] > -1) {
+ int opcode = packet->insn[ilist[current_insn]].opcode;
+ if (GET_ATTRIB(opcode, attribute)) {
+ /* Needs two available resources */
+ if ((resources[resource0] + resources[resource1]) == 2 * FREE)
{
+ resources[resource0] = USED;
+ resources[resource1] = USED;
+ packet->insn[ilist[current_insn]].hvx_resource |=
+ (1 << resource0);
+ packet->insn[ilist[current_insn]].hvx_resource |=
+ (1 << resource1);
+ } else {
+ g_assert_not_reached();
+ }
+ ilist[current_insn] = -1; /* Remove Instruction */
+ }
+ }
+ }
+ return 0;
+}
+
+/* Double Vector instructions that can use any one of specific or both pairs */
+static int
+check_dv_instruction2(hvx_resource_t *resources, int *ilist,
+ int num_insn, packet_t *packet, unsigned int attribute,
+ hvx_resource_t resource0, hvx_resource_t resource1,
+ hvx_resource_t resource2, hvx_resource_t resource3)
+{
+
+ int current_insn = 0;
+ /* Loop on vector instruction count */
+ for (current_insn = 0; current_insn < num_insn; current_insn++) {
+ /* valid instruction */
+ if (ilist[current_insn] > -1) {
+ int opcode = packet->insn[ilist[current_insn]].opcode;
+ if (GET_ATTRIB(opcode, attribute)) {
+ /* Needs two available resources */
+ if ((resources[resource0] + resources[resource1]) == 2 * FREE)
{
+ resources[resource0] = USED;
+ resources[resource1] = USED;
+ packet->insn[ilist[current_insn]].hvx_resource |=
+ (1 << resource0);
+ packet->insn[ilist[current_insn]].hvx_resource |=
+ (1 << resource1);
+ } else if ((resources[resource2] + resources[resource3]) ==
+ 2 * FREE) {
+ resources[resource2] = USED;
+ resources[resource3] = USED;
+ packet->insn[ilist[current_insn]].hvx_resource |=
+ (1 << resource0);
+ packet->insn[ilist[current_insn]].hvx_resource |=
+ (1 << resource1);
+ } else {
+ g_assert_not_reached();
+ }
+ ilist[current_insn] = -1; /* Remove Instruction */
+ }
+ }
+ }
+ return 0;
+}
+
+static int
+check_umem_instruction(hvx_resource_t *resources, int *ilist,
+ int num_insn, packet_t *packet)
+{
+
+ int current_insn = 0;
+ /* Loop on vector instruction count */
+ for (current_insn = 0; current_insn < num_insn; current_insn++) {
+ /* valid instruction */
+ if (ilist[current_insn] > -1) {
+ int opcode = packet->insn[ilist[current_insn]].opcode;
+ /* check attribute */
+ if (GET_ATTRIB(opcode, A_CVI_VP) && GET_ATTRIB(opcode, A_CVI_VM)) {
+ /* Needs three available resources, both mem and permute */
+ if ((resources[HVX_RESOURCE_LOAD] +
+ resources[HVX_RESOURCE_STORE] +
+ resources[HVX_RESOURCE_PERM]) == 3 * FREE) {
+ resources[HVX_RESOURCE_LOAD] = USED;
+ resources[HVX_RESOURCE_STORE] = USED;
+ resources[HVX_RESOURCE_PERM] = USED;
+ packet->insn[ilist[current_insn]].hvx_resource |=
+ (1 << HVX_RESOURCE_LOAD);
+ packet->insn[ilist[current_insn]].hvx_resource |=
+ (1 << HVX_RESOURCE_STORE);
+ packet->insn[ilist[current_insn]].hvx_resource |=
+ (1 << HVX_RESOURCE_PERM);
+ } else {
+ g_assert_not_reached();
+ }
+
+ ilist[current_insn] = -1; /* Remove Instruction */
+ }
+ }
+ }
+ return 0;
+}
+
+
+/* Memory instructions */
+static int
+check_mem_instruction(hvx_resource_t *resources, int *ilist,
+ int num_insn, packet_t *packet)
+{
+
+ int current_insn = 0;
+ /* Loop on vector instruction count */
+ for (current_insn = 0; current_insn < num_insn; current_insn++) {
+ /* valid instruction */
+ if (ilist[current_insn] > -1) {
+ int opcode = packet->insn[ilist[current_insn]].opcode;
+ if (GET_ATTRIB(opcode, A_CVI_VM)) {
+ if (GET_ATTRIB(opcode, A_LOAD)) {
+ if (resources[HVX_RESOURCE_LOAD] == FREE) {
+ resources[HVX_RESOURCE_LOAD] = USED;
+ packet->insn[ilist[current_insn]].hvx_resource |=
+ (1 << HVX_RESOURCE_LOAD);
+ } else {
+ g_assert_not_reached();
+ }
+
+ } else if (GET_ATTRIB(opcode, A_STORE)) {
+ if (resources[HVX_RESOURCE_STORE] == FREE) {
+ resources[HVX_RESOURCE_STORE] = USED;
+ packet->insn[ilist[current_insn]].hvx_resource |=
+ (1 << HVX_RESOURCE_STORE);
+ } else {
+ g_assert_not_reached();
+ }
+ } else {
+ g_assert_not_reached();
+ }
+
+ /* Not a load temp and not a store new */
+ if (!(GET_ATTRIB(opcode, A_CVI_TMP) &&
+ GET_ATTRIB(opcode, A_LOAD)) &&
+ !(GET_ATTRIB(opcode, A_CVI_NEW) &&
+ GET_ATTRIB(opcode, A_STORE))) {
+ /* Grab any one of the other resources */
+ if (resources[HVX_RESOURCE_PERM] == FREE) {
+ resources[HVX_RESOURCE_PERM] = USED;
+ packet->insn[ilist[current_insn]].hvx_resource |=
+ (1 << HVX_RESOURCE_PERM);
+ } else if (resources[HVX_RESOURCE_SHIFT] == FREE) {
+ resources[HVX_RESOURCE_SHIFT] = USED;
+ packet->insn[ilist[current_insn]].hvx_resource |=
+ (1 << HVX_RESOURCE_SHIFT);
+ } else if (resources[HVX_RESOURCE_MPY0] == FREE) {
+ resources[HVX_RESOURCE_MPY0] = USED;
+ packet->insn[ilist[current_insn]].hvx_resource |=
+ (1 << HVX_RESOURCE_MPY0);
+ } else if (resources[HVX_RESOURCE_MPY1] == FREE) {
+ resources[HVX_RESOURCE_MPY1] = USED;
+ packet->insn[ilist[current_insn]].hvx_resource |=
+ (1 << HVX_RESOURCE_MPY1);
+ } else {
+ g_assert_not_reached();
+ }
+ }
+ ilist[current_insn] = -1; /* Remove Instruction */
+ }
+ }
+ }
+ return 0;
+}
+
+/*
+ * Single Vector instructions that can use one, two, or four resources
+ * Insert instruction into one possible resource
+ */
+static int
+check_instruction1(hvx_resource_t *resources, int *ilist,
+ int num_insn, packet_t *packet, unsigned int attribute,
+ hvx_resource_t resource0)
+{
+
+ int current_insn = 0;
+ /* Loop on vector instruction count */
+ for (current_insn = 0; current_insn < num_insn; current_insn++) {
+ /* valid instruction */
+ if (ilist[current_insn] > -1) {
+ int opcode = packet->insn[ilist[current_insn]].opcode;
+ if (GET_ATTRIB(opcode, attribute)) {
+ /* Needs two available resources */
+ if (resources[resource0] == FREE) {
+ resources[resource0] = USED;
+ packet->insn[ilist[current_insn]].hvx_resource |=
+ (1 << resource0);
+ } else {
+ g_assert_not_reached();
+ }
+
+ ilist[current_insn] = -1; /* Remove Instruction */
+ }
+ }
+ }
+ return 0;
+}
+
+/* Insert instruction into one of two possible resource2 */
+static int
+check_instruction2(hvx_resource_t *resources, int *ilist,
+ int num_insn, packet_t *packet, unsigned int attribute,
+ hvx_resource_t resource0, hvx_resource_t resource1)
+{
+
+ int current_insn = 0;
+ /* Loop on vector instruction count */
+ for (current_insn = 0; current_insn < num_insn; current_insn++) {
+ /* valid instruction */
+ if (ilist[current_insn] > -1) {
+ int opcode = packet->insn[ilist[current_insn]].opcode;
+ if (GET_ATTRIB(opcode, attribute)) {
+ /* Needs one of two possible available resources */
+ if (resources[resource0] == FREE) {
+ resources[resource0] = USED;
+ packet->insn[ilist[current_insn]].hvx_resource |=
+ (1 << resource0);
+ } else if (resources[resource1] == FREE) {
+ resources[resource1] = USED;
+ packet->insn[ilist[current_insn]].hvx_resource |=
+ (1 << resource1);
+ } else {
+ g_assert_not_reached();
+ }
+
+ ilist[current_insn] = -1; /* Remove Instruction */
+ }
+ }
+ }
+ return 0;
+}
+
+/* Insert instruction into one of 4 four possible resource */
+static int
+check_instruction4(hvx_resource_t *resources, int *ilist,
+ int num_insn, packet_t *packet, unsigned int attribute,
+ hvx_resource_t resource0, hvx_resource_t resource1,
+ hvx_resource_t resource2, hvx_resource_t resource3)
+{
+
+ int current_insn = 0;
+ /* Loop on vector instruction count */
+ for (current_insn = 0; current_insn < num_insn; current_insn++) {
+ /* valid instruction */
+ if (ilist[current_insn] > -1) {
+ int opcode = packet->insn[ilist[current_insn]].opcode;
+ if (GET_ATTRIB(opcode, attribute)) {
+ /* Needs one of four available resources */
+ if (resources[resource0] == FREE) {
+ resources[resource0] = USED;
+ packet->insn[ilist[current_insn]].hvx_resource |=
+ (1 << resource0);
+ } else if (resources[resource1] == FREE) {
+ resources[resource1] = USED;
+ packet->insn[ilist[current_insn]].hvx_resource |=
+ (1 << resource1);
+ } else if (resources[resource2] == FREE) {
+ resources[resource2] = USED;
+ packet->insn[ilist[current_insn]].hvx_resource |=
+ (1 << resource2);
+ } else if (resources[resource3] == FREE) {
+ resources[resource3] = USED;
+ packet->insn[ilist[current_insn]].hvx_resource |=
+ (1 << resource3);
+ } else {
+ g_assert_not_reached();
+ }
+
+ ilist[current_insn] = -1; /* Remove Instruction */
+ }
+ }
+ }
+ return 0;
+}
+
+static int
+check_4res_instruction(hvx_resource_t *resources, int *ilist,
+ int num_insn, packet_t *packet)
+{
+
+ int current_insn = 0;
+ for (current_insn = 0; current_insn < num_insn; current_insn++) {
+ if (ilist[current_insn] > -1) {
+ int opcode = packet->insn[ilist[current_insn]].opcode;
+ if (GET_ATTRIB(opcode, A_CVI_4SLOT)) {
+ int available_resource =
+ resources[HVX_RESOURCE_PERM]
+ + resources[HVX_RESOURCE_SHIFT]
+ + resources[HVX_RESOURCE_MPY0]
+ + resources[HVX_RESOURCE_MPY1];
+
+ if (available_resource == 4 * FREE) {
+ resources[HVX_RESOURCE_PERM] = USED;
+ resources[HVX_RESOURCE_SHIFT] = USED;
+ resources[HVX_RESOURCE_MPY0] = USED;
+ resources[HVX_RESOURCE_MPY1] = USED;
+ packet->insn[ilist[current_insn]].hvx_resource |=
+ (1 << HVX_RESOURCE_PERM);
+ packet->insn[ilist[current_insn]].hvx_resource |=
+ (1 << HVX_RESOURCE_SHIFT);
+ packet->insn[ilist[current_insn]].hvx_resource |=
+ (1 << HVX_RESOURCE_MPY0);
+ packet->insn[ilist[current_insn]].hvx_resource |=
+ (1 << HVX_RESOURCE_MPY1);
+ } else {
+ g_assert_not_reached();
+ }
+
+ ilist[current_insn] = -1; /* Remove Instruction */
+ }
+ }
+
+ }
+ return 0;
+}
+
+
+static int
+decode_populate_cvi_resources(packet_t *packet)
+{
+
+ int i, num_insn = 0;
+ int vlist[4] = {-1, -1, -1, -1};
+ hvx_resource_t hvx_resources[8] = {
+ FREE,
+ FREE,
+ FREE,
+ FREE,
+ FREE,
+ FREE,
+ FREE,
+ FREE
+ }; /* All Available */
+ int errors = 0;
+
+
+ /* Count Vector instructions and check for deprecated ones */
+ for (num_insn = 0, i = 0; i < packet->num_insns; i++) {
+ if (GET_ATTRIB(packet->insn[i].opcode, A_CVI)) {
+ vlist[num_insn++] = i;
+ }
+ }
+
+ /* Instructions that consume all vector resources */
+ errors += check_4res_instruction(hvx_resources, vlist, num_insn, packet);
+ /* Insert Unaligned Memory Access */
+ errors += check_umem_instruction(hvx_resources, vlist, num_insn, packet);
+
+ /* double vector permute Consumes both permute and shift resources */
+ errors += check_dv_instruction(hvx_resources, vlist, num_insn,
+ packet, A_CVI_VP_VS,
+ HVX_RESOURCE_SHIFT, HVX_RESOURCE_PERM);
+ /* Single vector permute can only go to permute resource */
+ errors += check_instruction1(hvx_resources, vlist, num_insn,
+ packet, A_CVI_VP, HVX_RESOURCE_PERM);
+ /* Single vector permute can only go to permute resource */
+ errors += check_instruction1(hvx_resources, vlist, num_insn,
+ packet, A_CVI_VS, HVX_RESOURCE_SHIFT);
+
+ /* Try to insert double vector multiply */
+ errors += check_dv_instruction(hvx_resources, vlist, num_insn,
+ packet, A_CVI_VX_DV,
+ HVX_RESOURCE_MPY0, HVX_RESOURCE_MPY1);
+ /* Try to insert double capacity mult */
+ errors += check_dv_instruction2(hvx_resources, vlist, num_insn,
+ packet, A_CVI_VS_VX,
+ HVX_RESOURCE_SHIFT, HVX_RESOURCE_MPY0,
+ HVX_RESOURCE_PERM, HVX_RESOURCE_MPY1);
+ /* Single vector permute can only go to permute resource */
+ errors += check_instruction2(hvx_resources, vlist, num_insn,
+ packet, A_CVI_VX,
+ HVX_RESOURCE_MPY0, HVX_RESOURCE_MPY1);
+ /* Try to insert double vector alu */
+ errors += check_dv_instruction2(hvx_resources, vlist, num_insn,
+ packet, A_CVI_VA_DV,
+ HVX_RESOURCE_SHIFT, HVX_RESOURCE_PERM,
+ HVX_RESOURCE_MPY0, HVX_RESOURCE_MPY1);
+
+ errors += check_mem_instruction(hvx_resources, vlist, num_insn, packet);
+ /* single vector alu can go on any of the 4 pipes */
+ errors += check_instruction4(hvx_resources, vlist, num_insn,
+ packet, A_CVI_VA,
+ HVX_RESOURCE_SHIFT, HVX_RESOURCE_PERM,
+ HVX_RESOURCE_MPY0, HVX_RESOURCE_MPY1);
+
+ return errors;
+}
+
+
+
+static int
+check_new_value(packet_t *packet)
+{
+ /* .New Value for a MMVector Store */
+ int i, j;
+ const char *reginfo;
+ const char *destletters;
+ const char *dststr = NULL;
+ size2u_t def_opcode;
+ char letter;
+ int def_regnum;
+
+ for (i = 1; i < packet->num_insns; i++) {
+ size2u_t use_opcode = packet->insn[i].opcode;
+ if (GET_ATTRIB(use_opcode, A_DOTNEWVALUE) &&
+ GET_ATTRIB(use_opcode, A_CVI) &&
+ GET_ATTRIB(use_opcode, A_STORE)) {
+ int use_regidx = strchr(opcode_reginfo[use_opcode], 's') -
+ opcode_reginfo[use_opcode];
+ /*
+ * What's encoded at the N-field is the offset to who's producing
+ * the value.
+ * Shift off the LSB which indicates odd/even register.
+ */
+ int def_off = ((packet->insn[i].regno[use_regidx]) >> 1);
+ int def_oreg = packet->insn[i].regno[use_regidx] & 1;
+ int def_idx = -1;
+ for (j = i - 1; (j >= 0) && (def_off >= 0); j--) {
+ if (!GET_ATTRIB(packet->insn[j].opcode, A_CVI)) {
+ continue;
+ }
+ def_off--;
+ if (def_off == 0) {
+ def_idx = j;
+ break;
+ }
+ }
+ /*
+ * Check for a badly encoded N-field which points to an instruction
+ * out-of-range
+ */
+ if ((def_off != 0) || (def_idx < 0) ||
+ (def_idx > (packet->num_insns - 1))) {
+ g_assert_not_reached();
+ }
+ /* previous insn is the producer */
+ def_opcode = packet->insn[def_idx].opcode;
+ reginfo = opcode_reginfo[def_opcode];
+ destletters = "dexy";
+ for (j = 0; (letter = destletters[j]) != 0; j++) {
+ dststr = strchr(reginfo, letter);
+ if (dststr != NULL) {
+ break;
+ }
+ }
+ if ((dststr == NULL) && GET_ATTRIB(def_opcode, A_CVI_GATHER)) {
+ def_regnum = 0;
+ packet->insn[i].regno[use_regidx] = def_oreg;
+ packet->insn[i].new_value_producer_slot =
+ packet->insn[def_idx].slot;
+ } else {
+ if (dststr == NULL) {
+ /* still not there, we have a bad packet */
+ g_assert_not_reached();
+ }
+ def_regnum = packet->insn[def_idx].regno[dststr - reginfo];
+ /* Now patch up the consumer with the register number */
+ packet->insn[i].regno[use_regidx] = def_regnum ^ def_oreg;
+ /* special case for (Vx,Vy) */
+ dststr = strchr(reginfo, 'y');
+ if (def_oreg && strchr(reginfo, 'x') && dststr) {
+ def_regnum = packet->insn[def_idx].regno[dststr - reginfo];
+ packet->insn[i].regno[use_regidx] = def_regnum;
+ }
+ /*
+ * We need to remember who produces this value to later
+ * check if it was dynamically cancelled
+ */
+ packet->insn[i].new_value_producer_slot =
+ packet->insn[def_idx].slot;
+ }
+ }
+ }
+ return 0;
+}
+
+/*
+ * We don't want to reorder slot1/slot0 with respect to each other.
+ * So in our shuffling, we don't want to move the .cur / .tmp vmem earlier
+ * Instead, we should move the producing instruction later
+ * But the producing instruction might feed a .new store!
+ * So we may need to move that even later.
+ */
+
+static void
+decode_mmvec_move_cvi_to_end(packet_t *packet, int max)
+{
+ int i;
+ for (i = 0; i < max; i++) {
+ if (GET_ATTRIB(packet->insn[i].opcode, A_CVI)) {
+ int last_inst = packet->num_insns - 1;
+
+ /*
+ * If the last instruction is an endloop, move to the one before it
+ * Keep endloop as the last thing always
+ */
+ if ((packet->insn[last_inst].opcode == J2_endloop0) ||
+ (packet->insn[last_inst].opcode == J2_endloop1) ||
+ (packet->insn[last_inst].opcode == J2_endloop01)) {
+ last_inst--;
+ }
+
+ decode_send_insn_to(packet, i, last_inst);
+ max--;
+ i--; /* Retry this index now that packet has rotated */
+ }
+ }
+}
+
+static int
+decode_shuffle_for_execution_vops(packet_t *packet)
+{
+ /*
+ * Sort for V.new = VMEM()
+ * Right now we need to make sure that the vload occurs before the
+ * permute instruction or VPVX ops
+ */
+ int i;
+ for (i = 0; i < packet->num_insns; i++) {
+ if (GET_ATTRIB(packet->insn[i].opcode, A_LOAD) &&
+ (GET_ATTRIB(packet->insn[i].opcode, A_CVI_NEW) ||
+ GET_ATTRIB(packet->insn[i].opcode, A_CVI_TMP))) {
+ /*
+ * Find prior consuming vector instructions
+ * Move to end of packet
+ */
+ decode_mmvec_move_cvi_to_end(packet, i);
+ break;
+ }
+ }
+ for (i = 0; i < packet->num_insns - 1; i++) {
+ if (GET_ATTRIB(packet->insn[i].opcode, A_STORE) &&
+ GET_ATTRIB(packet->insn[i].opcode, A_CVI_NEW) &&
+ !GET_ATTRIB(packet->insn[i].opcode, A_CVI_SCATTER_RELEASE)) {
+ /* decode_send_insn_to the end */
+ int last_inst = packet->num_insns - 1;
+
+ /*
+ * If the last instruction is an endloop, move to the one before it
+ * Keep endloop as the last thing always
+ */
+ if ((packet->insn[last_inst].opcode == J2_endloop0) ||
+ (packet->insn[last_inst].opcode == J2_endloop1) ||
+ (packet->insn[last_inst].opcode == J2_endloop01)) {
+ last_inst--;
+ }
+
+ decode_send_insn_to(packet, i, last_inst);
+ break;
+ }
+ }
+ return 0;
+}
+
+/* Collect stats on HVX packet */
+static void
+decode_hvx_packet_contents(packet_t *pkt) {
+ pkt->pkt_hvx_va = 0;
+ pkt->pkt_hvx_vx = 0;
+ pkt->pkt_hvx_vp = 0;
+ pkt->pkt_hvx_vs = 0;
+ pkt->pkt_hvx_all = 0;
+ pkt->pkt_hvx_none = 0;
+ pkt->pkt_has_hvx = 0;
+
+ for (int i = 0; i < pkt->num_insns; i++) {
+ pkt->pkt_hvx_va += GET_ATTRIB(pkt->insn[i].opcode, A_CVI_VA);
+ pkt->pkt_hvx_vx += GET_ATTRIB(pkt->insn[i].opcode, A_CVI_VX);
+ pkt->pkt_hvx_vp += GET_ATTRIB(pkt->insn[i].opcode, A_CVI_VP);
+ pkt->pkt_hvx_vs += GET_ATTRIB(pkt->insn[i].opcode, A_CVI_VS);
+ pkt->pkt_hvx_none += GET_ATTRIB(pkt->insn[i].opcode, A_CVI_TMP);
+ pkt->pkt_hvx_all += GET_ATTRIB(pkt->insn[i].opcode, A_CVI_4SLOT);
+ pkt->pkt_hvx_va += 2 * GET_ATTRIB(pkt->insn[i].opcode, A_CVI_VA_DV);
+ pkt->pkt_hvx_vx += 2 * GET_ATTRIB(pkt->insn[i].opcode, A_CVI_VX_DV);
+ pkt->pkt_hvx_vp += GET_ATTRIB(pkt->insn[i].opcode, A_CVI_VP_VS);
+ pkt->pkt_hvx_vs += GET_ATTRIB(pkt->insn[i].opcode, A_CVI_VP_VS);
+ pkt->pkt_has_hvx |= pkt->insn[i].hvx_resource ? 1 : 0;
+ }
+}
+
+/*
+ * Public Functions
+ */
+
+const char *
+mmvec_ext_decode_find_iclass_slots(int opcode)
+{
+ if (GET_ATTRIB(opcode, A_CVI_VM)) {
+ if (GET_ATTRIB(opcode, A_RESTRICT_SLOT0ONLY)) {
+ return "0";
+ } else if (GET_ATTRIB(opcode, A_RESTRICT_SLOT1ONLY)) {
+ return "1";
+ }
+ return "01";
+ } else if (GET_ATTRIB(opcode, A_RESTRICT_SLOT2ONLY)) {
+ return "2";
+ } else if (GET_ATTRIB(opcode, A_CVI_VX)) {
+ return "23";
+ } else if (GET_ATTRIB(opcode, A_CVI_VS_VX)) {
+ return "23";
+ } else {
+ return "0123";
+ }
+}
+
+int mmvec_ext_decode_checks(packet_t *packet)
+{
+ int errors = 0;
+ errors += check_new_value(packet);
+ errors += decode_populate_cvi_resources(packet);
+ errors += decode_shuffle_for_execution_vops(packet);
+
+ if (errors == 0) {
+ decode_hvx_packet_contents(packet);
+ }
+
+ return errors;
+}
+
diff --git a/target/hexagon/mmvec/decode_ext_mmvec.h
b/target/hexagon/mmvec/decode_ext_mmvec.h
new file mode 100644
index 0000000..fa3eb2d
--- /dev/null
+++ b/target/hexagon/mmvec/decode_ext_mmvec.h
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2019 Qualcomm Innovation Center, Inc. All Rights Reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef DECODE_EXT_MMVEC_H
+#define DECODE_EXT_MMVEC_H
+
+extern int mmvec_ext_decode_checks(packet_t *pkt);
+extern const char *mmvec_ext_decode_find_iclass_slots(int opcode);
+
+#endif
diff --git a/target/hexagon/q6v_decode.c b/target/hexagon/q6v_decode.c
index 029475f..efd5cef 100644
--- a/target/hexagon/q6v_decode.c
+++ b/target/hexagon/q6v_decode.c
@@ -161,6 +161,13 @@ decode_insns_tablewalk(insn_t *insn, dectree_table_t
*table, size4u_t encoding)
}
decode_op(insn, opc, encoding);
return 1;
+ } else if (table->table[i].type == DECTREE_EXTSPACE) {
+ size4u_t active_ext;
+ /*
+ * For now, HVX will be the only coproc
+ */
+ active_ext = 4;
+ return decode_insns_tablewalk(insn, ext_trees[active_ext], encoding);
} else {
return 0;
}
@@ -356,10 +363,13 @@ static int do_decode_packet(int max_words, const size4u_t
*words, packet_t *pkt)
pkt->pkt_has_payload = 1;
}
}
+ pkt->pkt_has_extension = 0;
pkt->pkt_has_initloop = 0;
pkt->pkt_has_initloop0 = 0;
pkt->pkt_has_initloop1 = 0;
for (i = 0; i < num_insns; i++) {
+ pkt->pkt_has_extension |=
+ GET_ATTRIB(pkt->insn[i].opcode, A_EXTENSION);
pkt->pkt_has_initloop0 |=
GET_ATTRIB(pkt->insn[i].opcode, A_HWLOOP0_SETUP);
pkt->pkt_has_initloop1 |=
@@ -391,6 +401,10 @@ static int do_decode_packet(int max_words, const size4u_t
*words, packet_t *pkt)
errors += decode_set_slot_number(pkt);
errors += decode_fill_newvalue_regno(pkt);
+ if (pkt->pkt_has_extension) {
+ errors += mmvec_ext_decode_checks(pkt);
+ }
+
errors += decode_shuffle_for_execution(pkt);
errors += decode_split_cmpjump(pkt);
errors += decode_set_insn_attr_fields(pkt);
--
2.7.4
