[RFC PATCH 63/66] Hexagon HVX helper to commit vector stores (masked and scatter/gather)

[Taylor Simpson]

Signed-off-by: Taylor Simpson <address@hidden>
---
 target/hexagon/helper.h    |  1 +
 target/hexagon/op_helper.c | 75 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 76 insertions(+)

diff --git a/target/hexagon/helper.h b/target/hexagon/helper.h
index 5dc0f71..3e4728d 100644
--- a/target/hexagon/helper.h
+++ b/target/hexagon/helper.h
@@ -21,6 +21,7 @@ DEF_HELPER_2(raise_exception, noreturn, env, i32)
 DEF_HELPER_1(debug_start_packet, void, env)
 DEF_HELPER_2(new_value, s32, env, int)
 DEF_HELPER_3(debug_check_store_width, void, env, int, int)
+DEF_HELPER_1(commit_hvx_stores, void, env)
 DEF_HELPER_3(debug_commit_end, void, env, int, int)
 DEF_HELPER_3(sfrecipa_val, s32, env, s32, s32)
 DEF_HELPER_3(sfrecipa_pred, s32, env, s32, s32)
diff --git a/target/hexagon/op_helper.c b/target/hexagon/op_helper.c
index 66ccd20..ac0b5b3 100644
--- a/target/hexagon/op_helper.c
+++ b/target/hexagon/op_helper.c
@@ -29,6 +29,8 @@
 #include "arch.h"
 #include "fma_emu.h"
 #include "conv_emu.h"
+#include "mmvec/mmvec.h"
+#include "mmvec/macros.h"
 
 #if COUNT_HEX_HELPERS
 #include "opcodes.h"
@@ -198,6 +200,51 @@ void HELPER(debug_check_store_width)(CPUHexagonState *env, 
int slot, int check)
     }
 }
 
+void HELPER(commit_hvx_stores)(CPUHexagonState *env)
+{
+    int i;
+
+    /* Normal (possibly masked) vector store */
+    for (i = 0; i < VSTORES_MAX; i++) {
+        if (env->vstore_pending[i]) {
+            env->vstore_pending[i] = 0;
+            target_ulong va = env->vstore[i].va;
+            int size = env->vstore[i].size;
+            for (int j = 0; j < size; j++) {
+                if (env->vstore[i].mask.ub[j]) {
+                    put_user_u8(env->vstore[i].data.ub[j], va + j);
+                }
+            }
+        }
+    }
+
+    /* Scatter store */
+    if (env->vtcm_pending) {
+        env->vtcm_pending = 0;
+        if (env->vtcm_log.op) {
+            /* Need to perform the scatter read/modify/write at commit time */
+            if (env->vtcm_log.op_size == 2) {
+                SCATTER_OP_WRITE_TO_MEM(size2u_t);
+            } else if (env->vtcm_log.op_size == 4) {
+                /* Word Scatter += */
+                SCATTER_OP_WRITE_TO_MEM(size4u_t);
+            } else {
+                g_assert_not_reached();
+            }
+        } else {
+            for (int i = 0; i < env->vtcm_log.size; i++) {
+                if (env->vtcm_log.mask.ub[i] != 0) {
+                    put_user_u8(env->vtcm_log.data.ub[i], env->vtcm_log.va[i]);
+                    env->vtcm_log.mask.ub[i] = 0;
+                    env->vtcm_log.data.ub[i] = 0;
+                    env->vtcm_log.offsets.ub[i] = 0;
+                }
+
+            }
+        }
+    }
+}
+
 static void print_store(CPUHexagonState *env, int slot)
 {
     if (!(env->slot_cancelled & (1 << slot))) {
@@ -413,6 +460,34 @@ void HELPER(debug_value_i64)(CPUHexagonState *env, int64_t 
value)
     HEX_DEBUG_LOG("value = 0x%lx\n", value);
 }
 
+/* Log a write to HVX vector */
+static inline void log_vreg_write(CPUHexagonState *env, int num, void *var,
+                                      int vnew, uint32_t slot)
+{
+    HEX_DEBUG_LOG("log_vreg_write[%d]", num);
+    if (env->slot_cancelled & (1 << slot)) {
+        HEX_DEBUG_LOG(" CANCELLED");
+    }
+    HEX_DEBUG_LOG("\n");
+
+    if (!(env->slot_cancelled & (1 << slot))) {
+        VRegMask regnum_mask = ((VRegMask)1) << num;
+        env->VRegs_updated |=      (vnew != EXT_TMP) ? regnum_mask : 0;
+        env->VRegs_select |=       (vnew == EXT_NEW) ? regnum_mask : 0;
+        env->VRegs_updated_tmp  |= (vnew == EXT_TMP) ? regnum_mask : 0;
+        env->future_VRegs[num] = *(mmvector_t *)var;
+        if (vnew == EXT_TMP) {
+            env->tmp_VRegs[num] = env->future_VRegs[num];
+        }
+    }
+}
+
+static inline void log_mmvector_write(CPUHexagonState *env, int num,
+                                      mmvector_t var, int vnew, uint32_t slot)
+{
+    log_vreg_write(env, num, &var, vnew, slot);
+}
+
 static void cancel_slot(CPUHexagonState *env, uint32_t slot)
 {
     HEX_DEBUG_LOG("Slot %d cancelled\n", slot);
-- 
2.7.4