From patchwork Wed Oct 6 15:20:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 515351 Delivered-To: patch@linaro.org Received: by 2002:ac0:b5cc:0:0:0:0:0 with SMTP id x12csp556853ime; Wed, 6 Oct 2021 08:58:58 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy5uYOVuC/jx8sHUL3unN5/+HQt2GHAN3Rtod2dkrcuSeZOks6qsA4gcKdhQpl7tzxSL7j8 X-Received: by 2002:a05:6102:3593:: with SMTP id h19mr24901220vsu.23.1633535937892; Wed, 06 Oct 2021 08:58:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633535937; cv=none; d=google.com; s=arc-20160816; b=gE1/Ky6zXpPGLGsmaktvb9SB4+qoqaz1G52n2jRIVgXWFXt0WSWXsyWb8lQrjQh09Q umhkBjmHoJev08Em6mFNoRyGn9xUnNCVFzYUXHK9xUafbRte0XLO9fVfKtV7H/1N7aoL Iyvxv9qugYCqEJ56Fk7nxzVE81WYa3xRMTjuqyWH81IQDbF236n1DVk0W8xpwgznZVqN hf2a3Hkd0KUsvHJTNmVlpN7bjXigIjtEHb+hMS65VbUmDPb7QJRFPwamK4DLsb8L/Gnb sffykptVtnYDP7oG5ko7Te3O00vIW9mieq0sojJ7nWXpLZgUdsfAvgtzxQaBlF0qmaqA S6Uw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=2juoC+G7qB76S6nskdGhvWIh5HNhk2DyYIr6roZcang=; b=imhiCN2M86/9lKh3E2G0qbtB54vYXPczyylBw8iLozAL0G3i+1lfcO17/x3Xqd6hDk /KrdSLBx1l2Df2p8Yu98lrwOQWOgQpGCy9aIYwMZ02IhFLNd5WOlmbh9SetYovU1ebEg gRPPqpmr+R3gErYuOuSnfHbFxAzV4v11f2isNtywEP0pEWV1Hd2wbkMsGV/IkknBY2Es BoETLbCAa6phdllzvCN7HzhyYnquhrXjibhYoAN+4Nh99uiLkTWigOSmq4Gv4/lyF9JW JVjUmsXGssLu0Y2N2lng9seAVw7p7MXfpSeyTMgy7PXMnOGUKE5/WKPPNrmc0Z5GhzMT A5Kg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=eAu+GO6F; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id v12si1729928vse.262.2021.10.06.08.58.57 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 06 Oct 2021 08:58:57 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=eAu+GO6F; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:34968 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mY9Jp-0008Ct-76 for patch@linaro.org; Wed, 06 Oct 2021 11:58:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47318) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mY8j4-0002d1-Ei for qemu-devel@nongnu.org; Wed, 06 Oct 2021 11:20:58 -0400 Received: from mail-pl1-x632.google.com ([2607:f8b0:4864:20::632]:33568) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mY8in-0007rB-Dy for qemu-devel@nongnu.org; Wed, 06 Oct 2021 11:20:58 -0400 Received: by mail-pl1-x632.google.com with SMTP id a11so1937099plm.0 for ; Wed, 06 Oct 2021 08:20:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=2juoC+G7qB76S6nskdGhvWIh5HNhk2DyYIr6roZcang=; b=eAu+GO6FfC9wZQhpsnuJ+S3aSrSollJOoqRhpgb5sGo+gDCNa1PRZh8xzQb9ITts37 5F8VYPVHYvHEZ7zUzvpzcT/cbCFsAMVdtjSqMYTq0CWj7RoKb2MtUcDREq9RdNQHD4or 0PmaxaqNufJ/JHWOd6dFB6vvn0STlHT/MVlEzt/XuK5owP919DODa+cJfZQu2B9eLLNa kPdK5fwOJP7PvI5qZb+IiUXC8AiFyS48CGmkX9f1sPTWsarU+O4xOKdENeHBvLXaMZsi zmi27XT40jPTHOPA3EWQHZTSHAt0YqvM6q0v9OHlo9076o/t7gK8FZ2SFzCbbtlIL9ul Kgbw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=2juoC+G7qB76S6nskdGhvWIh5HNhk2DyYIr6roZcang=; b=HlkeBG7rIeLhqdmtzWLVC3itU5uFZb2G1M249qfALnFQryO5DoEUHkwmpLc5BbZj6N Gw5fsWpH1ur1WrQcplcVn6f3J9QxRsffQFO+BsjgaXI4FyhI5Q9oqyIh6GomwGbGpaUd JdFRWJ9qfgRGy+OiD/0O79PQ1YeUerpcTr5P/hpBbgRjR1VRjLiNFZOIpU+W7tCGsVyH hGIAowWLINAiSUr6uL+nhgNq/MhCJOal5hHKxNiDfBWwILdEsWZhyjIq7D1yRZTSLWb+ 8knNQ4LsYA7MUdUHdedZn/inEMVVc5nREGN2+fMtxX/7hoenlXRK+U04yzNw7bGVB8Mt yh2g== X-Gm-Message-State: AOAM531W20ePc9FlE/xmH08XjEJH1DFfOBUDPjqcfVz5UclWjrEjm19C pKRG9Lrvx3pJJVSinK+fpZ2iTS9/4cppgw== X-Received: by 2002:a17:90a:4a04:: with SMTP id e4mr11482153pjh.51.1633533632408; Wed, 06 Oct 2021 08:20:32 -0700 (PDT) Received: from localhost.localdomain ([71.212.134.125]) by smtp.gmail.com with ESMTPSA id 130sm22239256pfz.77.2021.10.06.08.20.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Oct 2021 08:20:31 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 18/28] tcg/s390x: Implement tcg_out_ld/st for vector types Date: Wed, 6 Oct 2021 08:20:04 -0700 Message-Id: <20211006152014.741026-19-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211006152014.741026-1-richard.henderson@linaro.org> References: <20211006152014.741026-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::632; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x632.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: David Hildenbrand Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Reviewed-by: David Hildenbrand Signed-off-by: Richard Henderson --- tcg/s390x/tcg-target.c.inc | 132 +++++++++++++++++++++++++++++++++---- 1 file changed, 120 insertions(+), 12 deletions(-) -- 2.25.1 diff --git a/tcg/s390x/tcg-target.c.inc b/tcg/s390x/tcg-target.c.inc index 8bee6dd26e..d80f25e48e 100644 --- a/tcg/s390x/tcg-target.c.inc +++ b/tcg/s390x/tcg-target.c.inc @@ -265,6 +265,12 @@ typedef enum S390Opcode { RX_STC = 0x42, RX_STH = 0x40, + VRX_VL = 0xe706, + VRX_VLLEZ = 0xe704, + VRX_VST = 0xe70e, + VRX_VSTEF = 0xe70b, + VRX_VSTEG = 0xe70a, + NOP = 0x0707, } S390Opcode; @@ -412,6 +418,16 @@ static void * const qemu_st_helpers[(MO_SIZE | MO_BSWAP) + 1] = { static const tcg_insn_unit *tb_ret_addr; uint64_t s390_facilities[3]; +static inline bool is_general_reg(TCGReg r) +{ + return r <= TCG_REG_R15; +} + +static inline bool is_vector_reg(TCGReg r) +{ + return r >= TCG_REG_V0 && r <= TCG_REG_V31; +} + static bool patch_reloc(tcg_insn_unit *src_rw, int type, intptr_t value, intptr_t addend) { @@ -529,6 +545,31 @@ static void tcg_out_insn_RSY(TCGContext *s, S390Opcode op, TCGReg r1, #define tcg_out_insn_RX tcg_out_insn_RS #define tcg_out_insn_RXY tcg_out_insn_RSY +static int RXB(TCGReg v1, TCGReg v2, TCGReg v3, TCGReg v4) +{ + /* + * Shift bit 4 of each regno to its corresponding bit of RXB. + * RXB itself begins at bit 8 of the instruction so 8 - 4 = 4 + * is the left-shift of the 4th operand. + */ + return ((v1 & 0x10) << (4 + 3)) + | ((v2 & 0x10) << (4 + 2)) + | ((v3 & 0x10) << (4 + 1)) + | ((v4 & 0x10) << (4 + 0)); +} + +static void tcg_out_insn_VRX(TCGContext *s, S390Opcode op, TCGReg v1, + TCGReg b2, TCGReg x2, intptr_t d2, int m3) +{ + tcg_debug_assert(is_vector_reg(v1)); + tcg_debug_assert(d2 >= 0 && d2 <= 0xfff); + tcg_debug_assert(is_general_reg(x2)); + tcg_debug_assert(is_general_reg(b2)); + tcg_out16(s, (op & 0xff00) | ((v1 & 0xf) << 4) | x2); + tcg_out16(s, (b2 << 12) | d2); + tcg_out16(s, (op & 0x00ff) | RXB(v1, 0, 0, 0) | (m3 << 12)); +} + /* Emit an opcode with "type-checking" of the format. */ #define tcg_out_insn(S, FMT, OP, ...) \ glue(tcg_out_insn_,FMT)(S, glue(glue(FMT,_),OP), ## __VA_ARGS__) @@ -705,25 +746,92 @@ static void tcg_out_mem(TCGContext *s, S390Opcode opc_rx, S390Opcode opc_rxy, } } +static void tcg_out_vrx_mem(TCGContext *s, S390Opcode opc_vrx, + TCGReg data, TCGReg base, TCGReg index, + tcg_target_long ofs, int m3) +{ + if (ofs < 0 || ofs >= 0x1000) { + if (ofs >= -0x80000 && ofs < 0x80000) { + tcg_out_insn(s, RXY, LAY, TCG_TMP0, base, index, ofs); + base = TCG_TMP0; + index = TCG_REG_NONE; + ofs = 0; + } else { + tcg_out_movi(s, TCG_TYPE_PTR, TCG_TMP0, ofs); + if (index != TCG_REG_NONE) { + tcg_out_insn(s, RRE, AGR, TCG_TMP0, index); + } + index = TCG_TMP0; + ofs = 0; + } + } + tcg_out_insn_VRX(s, opc_vrx, data, base, index, ofs, m3); +} /* load data without address translation or endianness conversion */ -static inline void tcg_out_ld(TCGContext *s, TCGType type, TCGReg data, - TCGReg base, intptr_t ofs) +static void tcg_out_ld(TCGContext *s, TCGType type, TCGReg data, + TCGReg base, intptr_t ofs) { - if (type == TCG_TYPE_I32) { - tcg_out_mem(s, RX_L, RXY_LY, data, base, TCG_REG_NONE, ofs); - } else { - tcg_out_mem(s, 0, RXY_LG, data, base, TCG_REG_NONE, ofs); + switch (type) { + case TCG_TYPE_I32: + if (likely(is_general_reg(data))) { + tcg_out_mem(s, RX_L, RXY_LY, data, base, TCG_REG_NONE, ofs); + break; + } + tcg_out_vrx_mem(s, VRX_VLLEZ, data, base, TCG_REG_NONE, ofs, MO_32); + break; + + case TCG_TYPE_I64: + if (likely(is_general_reg(data))) { + tcg_out_mem(s, 0, RXY_LG, data, base, TCG_REG_NONE, ofs); + break; + } + /* fallthru */ + + case TCG_TYPE_V64: + tcg_out_vrx_mem(s, VRX_VLLEZ, data, base, TCG_REG_NONE, ofs, MO_64); + break; + + case TCG_TYPE_V128: + /* Hint quadword aligned. */ + tcg_out_vrx_mem(s, VRX_VL, data, base, TCG_REG_NONE, ofs, 4); + break; + + default: + g_assert_not_reached(); } } -static inline void tcg_out_st(TCGContext *s, TCGType type, TCGReg data, - TCGReg base, intptr_t ofs) +static void tcg_out_st(TCGContext *s, TCGType type, TCGReg data, + TCGReg base, intptr_t ofs) { - if (type == TCG_TYPE_I32) { - tcg_out_mem(s, RX_ST, RXY_STY, data, base, TCG_REG_NONE, ofs); - } else { - tcg_out_mem(s, 0, RXY_STG, data, base, TCG_REG_NONE, ofs); + switch (type) { + case TCG_TYPE_I32: + if (likely(is_general_reg(data))) { + tcg_out_mem(s, RX_ST, RXY_STY, data, base, TCG_REG_NONE, ofs); + } else { + tcg_out_vrx_mem(s, VRX_VSTEF, data, base, TCG_REG_NONE, ofs, 1); + } + break; + + case TCG_TYPE_I64: + if (likely(is_general_reg(data))) { + tcg_out_mem(s, 0, RXY_STG, data, base, TCG_REG_NONE, ofs); + break; + } + /* fallthru */ + + case TCG_TYPE_V64: + tcg_out_vrx_mem(s, VRX_VSTEG, data, base, TCG_REG_NONE, ofs, 0); + break; + + case TCG_TYPE_V128: + /* Hint quadword aligned. */ + tcg_out_vrx_mem(s, VRX_VST, data, base, TCG_REG_NONE, ofs, 4); + break; + + default: + g_assert_not_reached(); } }