From patchwork Mon Jan 30 21:48:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 648605 Delivered-To: patch@linaro.org Received: by 2002:a17:522:d8c:b0:4be:c3dc:14d8 with SMTP id d12csp1394667pva; Mon, 30 Jan 2023 13:49:29 -0800 (PST) X-Google-Smtp-Source: AK7set/r6y7nIq8mHnrDwZt8KCcHRi8KpjIsazmht4S8RUpQMul8lk6FdAX0kIVle88NVmG7+aeS X-Received: by 2002:a05:622a:54a:b0:3b8:5199:f84a with SMTP id m10-20020a05622a054a00b003b85199f84amr15093576qtx.3.1675115369744; Mon, 30 Jan 2023 13:49:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675115369; cv=none; d=google.com; s=arc-20160816; b=TEzWIylyzLhY7e6yyP85Edh9BZEFCFnzchciM3XH352jauhZeBW/lfiXzutZtO/gH+ WOISHrcWuS7L74YROet1JTmBQczjt3Pler+K5NzZgsUO3+/V2B10zBQMh+0I6sZDfCSS DCB7jQbBlm1SADdmH0xNKgCCnBjzMqH2G1h4/yNN4v3GAx0WiiXctu8HOdOxvwiBVMuR 8qQ+XkSZ2QWAaIZW45XS868E+v+9AEXUys5FfWH21AsuRz0Bg1UuFrulZ8ZtIiGI49yO cbrfym+Xmvyy/Kt1cdLYlNIg1rTfdPbvtP6HcYlOtDYdgA1kEGa0KQqounhxhOsmfzDv MC4g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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:cc:to :from:dkim-signature; bh=C/L7rpu7pR8QgddFOconCzyTsPMIEKIuZwLXecbYJWA=; b=DIknqN3LQzcNcJhDS76Vxiu6qHiFCw+Yn8kF37qHfDZQIp3oEaMu2zx6WoDtyfv8xa GiPWDeE3dcuo2m9iEqm+0N9/nSI3eXT9fbX/iE0c0hr5wqQYN8d4pxA9cyCf9NAWNEGF pD14groT2mY/gJUissCq1eokdy0KldI4Zllb7K0fllfe1+ws3MyTQ9MaBME0ZN/+DKyL CKyGO7Eq6rHpLcluPIhlP494ygdffCN5IMvc6iXUQc5X7a7yRXFM7wOfoHq1KXg4jhtt BMBs9ivj85DZ64RgvfVEJeRn/MTtcF7HcUHuCo4xyum3Cyg6a9EqsRi+bd/ovy51Vj0M ZKeA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=j6EtLzuL; 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 z27-20020ac8431b000000b003b835e7e258si3990265qtm.279.2023.01.30.13.49.29 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 30 Jan 2023 13:49:29 -0800 (PST) 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=j6EtLzuL; 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] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pMc1T-0001vq-P9; Mon, 30 Jan 2023 16:49:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pMc1S-0001ux-El for qemu-devel@nongnu.org; Mon, 30 Jan 2023 16:49:06 -0500 Received: from mail-pj1-x102e.google.com ([2607:f8b0:4864:20::102e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pMc1Q-0005cH-RI for qemu-devel@nongnu.org; Mon, 30 Jan 2023 16:49:06 -0500 Received: by mail-pj1-x102e.google.com with SMTP id b10so12406048pjo.1 for ; Mon, 30 Jan 2023 13:49:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=C/L7rpu7pR8QgddFOconCzyTsPMIEKIuZwLXecbYJWA=; b=j6EtLzuLDO9FfSPxe/kh40iMUp4UPIC3XYJI9YuakAqSiTE3F3Z7s4fjcsnsK9UD0e AYuvEfunP+IV0SF7z9kp542gbj1LKnWNEHC55XMZHCxzSAqBQAFKO/Oe/hj9+5mQvGdN tvYGRO0deVjYS+EgwPJinrIOv1R7H1VDFGezMZXbcaKQhyz0hyXDn+PWXbIXlRMe/K7g S+mQZVE8VJU5T1XkLBsxV/iW/2kZS8apJg7bUL+jocRqCL3aSisGv4qtoVLRvoh+0Tpn JVrWvEYaIjjimOrLL1NRWPBsV/H36C0USu+Usoqf8rd9DwNDFUxnwj+a2NjWKfeYVvgm CwLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=C/L7rpu7pR8QgddFOconCzyTsPMIEKIuZwLXecbYJWA=; b=I3UOuxAWzAPbvmmtdmjsPfHvqAhDw5v/TbbmDsSZYW6A1kZWEldNRxSNhJpW+sqydb B9cBw1Uk3xLIReE2wX5k5I7WPaUd1ZpiTnOMKtHfkdfeRdPZJqSR4YSnouz5LNXPB9/E kLFNOSy3Ef1GxYuX9zlEWdIkd3cDrCgZgcm6vDH0D1s9QdwXfHulIS0TZryjKYKYLAyd yCM+wUOgQ7T/yG21LO0Hgo1ZS4bVZcEreROCjq0pBaRVWN74aFrrqLvaF1d8+9urGz7p yfWtUPAc3PfG9/ToE1xzqhWYq2IgbWvFLwTJy4rjxKBdThqRQkG7mAiVxqeINBe1IbKu 3hUg== X-Gm-Message-State: AO0yUKUchfiCC1gpx6OyCo7KosmPd6E0qq35DoJ+Br/29aIfCyuwSphu LAsxFpWFKdSWByaZsaxLkox7Tqb/EOEFJmTE X-Received: by 2002:a17:90b:4f43:b0:22c:9591:ce7e with SMTP id pj3-20020a17090b4f4300b0022c9591ce7emr6319868pjb.31.1675115343504; Mon, 30 Jan 2023 13:49:03 -0800 (PST) Received: from stoup.. (rrcs-173-197-98-118.west.biz.rr.com. [173.197.98.118]) by smtp.gmail.com with ESMTPSA id t4-20020a17090ad14400b00219220edf0dsm7451215pjw.48.2023.01.30.13.49.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 13:49:03 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: alex.bennee@linaro.org, philmd@linaro.org Subject: [PATCH v6 09/36] tcg/i386: Add TCG_TARGET_CALL_{RET,ARG}_I128 Date: Mon, 30 Jan 2023 11:48:17 -1000 Message-Id: <20230130214844.1158612-10-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230130214844.1158612-1-richard.henderson@linaro.org> References: <20230130214844.1158612-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::102e; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x102e.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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Fill in the parameters for the host ABI for Int128. Adjust tcg_target_call_oarg_reg for _WIN64, and tcg_out_call for i386 sysv. Allow TCG_TYPE_V128 stores without AVX enabled. Reviewed-by: Alex Bennée Signed-off-by: Richard Henderson --- tcg/i386/tcg-target.h | 10 ++++++++++ tcg/i386/tcg-target.c.inc | 30 +++++++++++++++++++++++++++++- 2 files changed, 39 insertions(+), 1 deletion(-) diff --git a/tcg/i386/tcg-target.h b/tcg/i386/tcg-target.h index 5797a55ea0..d4f2a6f8c2 100644 --- a/tcg/i386/tcg-target.h +++ b/tcg/i386/tcg-target.h @@ -100,6 +100,16 @@ typedef enum { #endif #define TCG_TARGET_CALL_ARG_I32 TCG_CALL_ARG_NORMAL #define TCG_TARGET_CALL_ARG_I64 TCG_CALL_ARG_NORMAL +#if defined(_WIN64) +# define TCG_TARGET_CALL_ARG_I128 TCG_CALL_ARG_BY_REF +# define TCG_TARGET_CALL_RET_I128 TCG_CALL_RET_BY_VEC +#elif TCG_TARGET_REG_BITS == 64 +# define TCG_TARGET_CALL_ARG_I128 TCG_CALL_ARG_NORMAL +# define TCG_TARGET_CALL_RET_I128 TCG_CALL_RET_NORMAL +#else +# define TCG_TARGET_CALL_ARG_I128 TCG_CALL_ARG_NORMAL +# define TCG_TARGET_CALL_RET_I128 TCG_CALL_RET_BY_REF +#endif extern bool have_bmi1; extern bool have_popcnt; diff --git a/tcg/i386/tcg-target.c.inc b/tcg/i386/tcg-target.c.inc index 2f0a9521bf..883ced8168 100644 --- a/tcg/i386/tcg-target.c.inc +++ b/tcg/i386/tcg-target.c.inc @@ -115,6 +115,11 @@ static TCGReg tcg_target_call_oarg_reg(TCGCallReturnKind kind, int slot) case TCG_CALL_RET_NORMAL: tcg_debug_assert(slot >= 0 && slot <= 1); return slot ? TCG_REG_EDX : TCG_REG_EAX; +#ifdef _WIN64 + case TCG_CALL_RET_BY_VEC: + tcg_debug_assert(slot == 0); + return TCG_REG_XMM0; +#endif default: g_assert_not_reached(); } @@ -1188,9 +1193,16 @@ static void tcg_out_st(TCGContext *s, TCGType type, TCGReg arg, * The gvec infrastructure is asserts that v128 vector loads * and stores use a 16-byte aligned offset. Validate that the * final pointer is aligned by using an insn that will SIGSEGV. + * + * This specific instance is also used by TCG_CALL_RET_BY_VEC, + * for _WIN64, which must have SSE2 but may not have AVX. */ tcg_debug_assert(arg >= 16); - tcg_out_vex_modrm_offset(s, OPC_MOVDQA_WxVx, arg, 0, arg1, arg2); + if (have_avx1) { + tcg_out_vex_modrm_offset(s, OPC_MOVDQA_WxVx, arg, 0, arg1, arg2); + } else { + tcg_out_modrm_offset(s, OPC_MOVDQA_WxVx, arg, arg1, arg2); + } break; case TCG_TYPE_V256: /* @@ -1677,6 +1689,22 @@ static void tcg_out_call(TCGContext *s, const tcg_insn_unit *dest, const TCGHelperInfo *info) { tcg_out_branch(s, 1, dest); + +#ifndef _WIN32 + if (TCG_TARGET_REG_BITS == 32 && info->out_kind == TCG_CALL_RET_BY_REF) { + /* + * The sysv i386 abi for struct return places a reference as the + * first argument of the stack, and pops that argument with the + * return statement. Since we want to retain the aligned stack + * pointer for the callee, we do not want to actually push that + * argument before the call but rely on the normal store to the + * stack slot. But we do need to compensate for the pop in order + * to reset our correct stack pointer value. + * Pushing a garbage value back onto the stack is quickest. + */ + tcg_out_push(s, TCG_REG_EAX); + } +#endif } static void tcg_out_jmp(TCGContext *s, const tcg_insn_unit *dest)