From patchwork Tue Feb 11 00:40:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Taylor Simpson X-Patchwork-Id: 1236101 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=quicinc.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=quicinc.com header.i=@quicinc.com header.a=rsa-sha256 header.s=qcdkim header.b=KcvIPY8t; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48Gl594Slvz9s3x for ; Tue, 11 Feb 2020 12:08:13 +1100 (AEDT) Received: from localhost ([::1]:41922 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j1K27-0001Qf-G2 for incoming@patchwork.ozlabs.org; Mon, 10 Feb 2020 20:08:11 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34934) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j1JdB-00035J-17 for qemu-devel@nongnu.org; Mon, 10 Feb 2020 19:42:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j1Jd9-0004rf-H3 for qemu-devel@nongnu.org; Mon, 10 Feb 2020 19:42:24 -0500 Received: from alexa-out-sd-02.qualcomm.com ([199.106.114.39]:59197) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j1Jd9-0004rC-0Z for qemu-devel@nongnu.org; Mon, 10 Feb 2020 19:42:23 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=quicinc.com; i=@quicinc.com; q=dns/txt; s=qcdkim; t=1581381743; x=1612917743; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Pp9Lk9V6WyraelkskLP0rMo4/Lvmws63pDJujN3GuLA=; b=KcvIPY8tDDN+KkV3LTBqGy1D2J3QN3KfP842LCnwv2D3r6UE5mn90qQ9 yRxjJ+Di8R+fqt86Pt527YqWdfyYairFMyCvFtGj3ezdlP8k1juY8wUbf ptAkPc0ZAixky1xl+mXB/8x49pKyeVFR3Kyh+xgNVkh+o4O1PfzFqsmXw I=; Received: from unknown (HELO ironmsg02-sd.qualcomm.com) ([10.53.140.142]) by alexa-out-sd-02.qualcomm.com with ESMTP; 10 Feb 2020 16:41:04 -0800 Received: from vu-tsimpson-aus.qualcomm.com (HELO vu-tsimpson1-aus.qualcomm.com) ([10.222.150.1]) by ironmsg02-sd.qualcomm.com with ESMTP; 10 Feb 2020 16:41:03 -0800 Received: by vu-tsimpson1-aus.qualcomm.com (Postfix, from userid 47164) id AE6701BB0; Mon, 10 Feb 2020 18:41:03 -0600 (CST) From: Taylor Simpson To: qemu-devel@nongnu.org Subject: [RFC PATCH 63/66] Hexagon HVX helper to commit vector stores (masked and scatter/gather) Date: Mon, 10 Feb 2020 18:40:41 -0600 Message-Id: <1581381644-13678-64-git-send-email-tsimpson@quicinc.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1581381644-13678-1-git-send-email-tsimpson@quicinc.com> References: <1581381644-13678-1-git-send-email-tsimpson@quicinc.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: FreeBSD 9.x [fuzzy] X-Received-From: 199.106.114.39 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: riku.voipio@iki.fi, richard.henderson@linaro.org, laurent@vivier.eu, Taylor Simpson , philmd@redhat.com, aleksandar.m.mail@gmail.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Taylor Simpson --- 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);