From patchwork Wed Jul 21 19:59:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 483330 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp6521778jao; Wed, 21 Jul 2021 13:09:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwo1UVXEsu7c+ylcD4Tm4rFV71VDbT5J0qT9gF1iSG2hmaxnS7BQSIculxOiAqPZBNNVZYM X-Received: by 2002:a1f:bf03:: with SMTP id p3mr33583660vkf.9.1626898188818; Wed, 21 Jul 2021 13:09:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626898188; cv=none; d=google.com; s=arc-20160816; b=KMQTLP/MPGLexRZDBAoBwRF7we/K+zZFMQnJERt7Jx5xNQl6iwmBZRSZ7B/p0L8yY1 pvhIK1RcpxdsslEP/B2yDIMhwozen9cX3U7rJ8phJRhMOROOunNqItvo6u4N8xSmsVTQ W+2yQYlIWMbADuG4oBtOX8zA+nzar0Og/6m3rN8XmJy60yCe/kRhpEytZqpk1CUIvnv/ GhCdIyZgzfGfCwQbp/f6recuhFm1L8hCKuP/TCexaCZ6HMxFvSoGtzzLThlNDYmpO7JC eTQfKf0l3bZu8tAE1hKgNirstycM8R0bmGxciolX+1Zy+AHf67R9IgbCgiTs0fx9veri QP+Q== 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=fPhqaj8tr3Rp4GKzrSeMc4wSTZdCBtqiRU4Qe7xA0xQ=; b=A/SOmfjC6qZlLqVr2Fx5EYuW+OLBvLRCCQevDb7xWOM5Q51oJoxQ6/gqXxSXgknc6J gkFWnjU3h/dgvpytbAIJAJizO4FYuykfHwODXQLRQ9IfxMEAsvgktZ4+sk/711h9RoWx 6kFNytCWkZ4JOTpf5JJVYY/k7UYDi67Vt/kZsfgMRBF7ZwhELWXAkP9QX05TbUayGTyK V7Bp0awO7Otn1CYV3nANsi7beg42R1OtNDtmkPx4l5xQexKnxzG+aEr0NuE0yKRAWfqv R3qB+d5Tdz69XT0kvhlVBhGCLpSuz3Ys8/8N+i5XFiqxXJDLF1ILYsaUfQd3VHvJSAcr 3r3g== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=GsWCS5Ey; 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=fail (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 37si10781965uav.94.2021.07.21.13.09.48 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 21 Jul 2021 13:09:48 -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=fail header.i=@linaro.org header.s=google header.b=GsWCS5Ey; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:46790 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m6IXM-0003LJ-3O for patch@linaro.org; Wed, 21 Jul 2021 16:09:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36638) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m6IO7-0002pR-Ow for qemu-devel@nongnu.org; Wed, 21 Jul 2021 16:00:15 -0400 Received: from mail-pl1-x629.google.com ([2607:f8b0:4864:20::629]:40840) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m6IO5-0005kH-Iv for qemu-devel@nongnu.org; Wed, 21 Jul 2021 16:00:15 -0400 Received: by mail-pl1-x629.google.com with SMTP id q13so720489plx.7 for ; Wed, 21 Jul 2021 13:00:13 -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=fPhqaj8tr3Rp4GKzrSeMc4wSTZdCBtqiRU4Qe7xA0xQ=; b=GsWCS5Ey8oX6PwrtDW7FeE57J9sPyPO9921ADoP2TNjJ5Y8VkRWeW52TvdAqm5/hwx XusKeF0BvK0FPmyUIluTgGWReoJ7YyYZYSrKDY7afdkGlH9NTleamX87v1aczuJXD5a1 dc+IxnwhESTpCF8podZe7OYQl/ursUeJIY/muq2orJm5wHNTBPejONKhYzcCXUMDvBsK 33Vty/HPgOmzlF3O4C6COuqm1PDEHkhz2zxotlFuGknufk4kVpmaHWkyxwnWFsnXaIjB bp/tNVDLJD0P19sGlKhXJZJDxGjDxEyFYChN1BSf7EysIc99iZ6PX3RgV0hAPcC4Z06b EIVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=fPhqaj8tr3Rp4GKzrSeMc4wSTZdCBtqiRU4Qe7xA0xQ=; b=QcTqamNU0cQYtpGRWE4Nzvk7S76THEnbpouOQNgbkzSgjAQDpbOTMp+V2JetvX09XE 3RfXifC3eRAZjAOt8QSiRkb21nC/zKF42MWOrnvQrc2nu2Rttf7nhAOIwk1FRZkSJDJF vFP8SlnszpmrqLNVBD8GXpTUHyYDLyHRyDqquw1vtQRHxpFSdht/IFmeKlc65CJkkuIR IPPp/tm6JIX2G8BrnVXumcA/Fb62LvGFLMQTuDVtv/w6RL4CfOjASTbzSU1V5WOiXepw 3OOMe3fZgDPUaIkuI3icsOojm9KN2nqAzypc1givBCxYessmQhhpPzrO0JGCvZb7Gc9Y zYlw== X-Gm-Message-State: AOAM533CjE6fj8WmQJYhvDIL9qXHOeooCHoZKSJ2ktbdoBbCvqSKuoU2 LuqFcTTLBheLl2nTn2VnsdTEMqtYuq0k0g== X-Received: by 2002:a62:36c5:0:b029:32b:83fa:3a3e with SMTP id d188-20020a6236c50000b029032b83fa3a3emr38553781pfa.52.1626897612273; Wed, 21 Jul 2021 13:00:12 -0700 (PDT) Received: from localhost.localdomain (204-210-126-223.res.spectrum.com. [204.210.126.223]) by smtp.gmail.com with ESMTPSA id w3sm706028pjq.12.2021.07.21.13.00.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Jul 2021 13:00:11 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 11/27] accel/tcg: Reduce CF_COUNT_MASK to match TCG_MAX_INSNS Date: Wed, 21 Jul 2021 09:59:38 -1000 Message-Id: <20210721195954.879535-12-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210721195954.879535-1-richard.henderson@linaro.org> References: <20210721195954.879535-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::629; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x629.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: =?utf-8?q?Alex_Benn=C3=A9e?= , peter.maydell@linaro.org, Mark Cave-Ayland Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The space reserved for CF_COUNT_MASK was overly large. Reduce to free up cflags bits and eliminate an extra test. Tested-by: Mark Cave-Ayland Signed-off-by: Richard Henderson Reviewed-by: Alex Bennée Reviewed-by: Peter Maydell Message-Id: <20210717221851.2124573-2-richard.henderson@linaro.org> --- include/exec/exec-all.h | 4 +++- accel/tcg/translate-all.c | 5 ++--- 2 files changed, 5 insertions(+), 4 deletions(-) -- 2.25.1 diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h index 754f4130c9..dfe82ed19c 100644 --- a/include/exec/exec-all.h +++ b/include/exec/exec-all.h @@ -492,7 +492,9 @@ struct TranslationBlock { target_ulong cs_base; /* CS base for this block */ uint32_t flags; /* flags defining in which context the code was generated */ uint32_t cflags; /* compile flags */ -#define CF_COUNT_MASK 0x00007fff + +/* Note that TCG_MAX_INSNS is 512; we validate this match elsewhere. */ +#define CF_COUNT_MASK 0x000001ff #define CF_LAST_IO 0x00008000 /* Last insn may be an IO access. */ #define CF_MEMI_ONLY 0x00010000 /* Only instrument memory ops */ #define CF_USE_ICOUNT 0x00020000 diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c index 4df26de858..5cc01d693b 100644 --- a/accel/tcg/translate-all.c +++ b/accel/tcg/translate-all.c @@ -1428,11 +1428,10 @@ TranslationBlock *tb_gen_code(CPUState *cpu, max_insns = cflags & CF_COUNT_MASK; if (max_insns == 0) { - max_insns = CF_COUNT_MASK; - } - if (max_insns > TCG_MAX_INSNS) { max_insns = TCG_MAX_INSNS; } + QEMU_BUILD_BUG_ON(CF_COUNT_MASK + 1 != TCG_MAX_INSNS); + if (cpu->singlestep_enabled || singlestep) { max_insns = 1; }