From patchwork Wed Feb 22 23:26:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 655711 Delivered-To: patch@linaro.org Received: by 2002:adf:a3c6:0:0:0:0:0 with SMTP id m6csp36389wrb; Wed, 22 Feb 2023 15:29:32 -0800 (PST) X-Google-Smtp-Source: AK7set9+N9aA2gGklVlnBFnrEHxhvDc7aChcI4EIWcN3A35by5rOX9bTUm0xxE+Mxjrwm1AoS7Gs X-Received: by 2002:a05:622a:1b8c:b0:3bc:dd21:4a0 with SMTP id bp12-20020a05622a1b8c00b003bcdd2104a0mr3861053qtb.30.1677108571919; Wed, 22 Feb 2023 15:29:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677108571; cv=none; d=google.com; s=arc-20160816; b=nA3Sjn8U3drXt0uQWitM3LXoHiBXqE7Uvw7GmWmHQ9EK/9jNXdSyQApd95tvl1fmzO v4AqBW+TbCBHtQ4OBUPD9buW8aimK6xvsXbRfQssnjhp3XO3Rw3o5QyorRkVGAcXTnyd bfBztQDsI2Dtx6T7g7wDVhDWBJVyvJGj4bEW7egfOgbvQ+8+qGtJ6vEZMXORgOGZZgxM r55AUzhP3bJtZe9b3g+d1iDVv8i/zprSFb/n4Llm15mX5mYZpj2qnk4gWXohWFXMHBeV CKUiBwWtpkim56fSPLIqSiTKzKhgsYt2FVBtshdeiFObYZjG3spQhR0vdxL0d9qQVcJM KxMg== 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=044lOBdNN9k7zB6D1jhexzPP0pLmLoW054ztxYqMPtc=; b=y1dd0r11f6ZOEvGQ5sQQfeoulnW5Y/x1x/KR6Jxxkt0dk6jElPdgFDMvPfD4NvwpEK g5adJuCV9KFK5KOLAbEQ2X96zIZ0jfhj/yL+WWlx65Ym2C4KQjNnk10rmU4WyDbb4Lrl BToiWsYpj/RILdemx1jnILI+bY5zPsxfsHYdWkvcblin3nALHnjcPJzwhYQD85xkWQit KiaFd6FMIqNZw0wqCjj4GrOlITD2Wu2G9+wg9t6vQlIV1cHdHAHtBooxSysYwX6K5Ezc XXmu8v1BIuFgJ2PhcoXK/L9ajt+PwoWjzNXpkkPALFdSpanSeW+/Dm+LTRpBM6qNSHCl 4Khw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=hIhyRCJ3; 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 i13-20020ac85c0d000000b003a8002eea20si5822283qti.212.2023.02.22.15.29.31 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 22 Feb 2023 15:29:31 -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=hIhyRCJ3; 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 1pUyWK-0000QR-53; Wed, 22 Feb 2023 18:27:32 -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 1pUyWI-0000Pi-FM for qemu-devel@nongnu.org; Wed, 22 Feb 2023 18:27:30 -0500 Received: from mail-pl1-x632.google.com ([2607:f8b0:4864:20::632]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pUyWG-0005JQ-QG for qemu-devel@nongnu.org; Wed, 22 Feb 2023 18:27:30 -0500 Received: by mail-pl1-x632.google.com with SMTP id ky4so11973435plb.3 for ; Wed, 22 Feb 2023 15:27:28 -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=044lOBdNN9k7zB6D1jhexzPP0pLmLoW054ztxYqMPtc=; b=hIhyRCJ3iMkQeG79fT2vqY9kjo7frLDA42vatHeW/fmGP8exVBWNNXcZeZ+pkln7eu x8fFUYzn18algtjxmUwIUMGaPs2Uf5sOvmBMRAipW1CKbPMzuLSa+Ggl+FRVW2EuR8j2 9n9MAgvC9CExV6j1NWZYEynHTjAcRDuYVUHixucrHP9iV3whPF4hCXNCbNJswtmuPqcu vsxMtMt3ZwzXfp/UfLMoEdgt9t7IblmPo7/mrLrJmBGqDSb3f3ljt1sUGmpJCULgk23f DF30QS0hn8u1AEpSv8QmyQy8CaIoZtYFfMNp5cBP5J9XpiliXu/QUZv5rZaWSS3wXh7h zBVw== 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=044lOBdNN9k7zB6D1jhexzPP0pLmLoW054ztxYqMPtc=; b=yxtCpav2+qfV4t5edcha0/CmS1jaub5okEJ9laoqbSETy9G2nymbYx8zV7Sponp5Yq CfsqobzQltHLyzwafRBPCd7PKXUwSJw+PRbF0uu4MmkL0U4qRUvgHIL+XfJew1WltyXR vFRwq694HdpGdTCv4X8rD0bPcVxJZk4EAJpleX47+GEWQdQbzYd0m5Me0BlBUFfEryd/ ivpN31WMmdJyOEuyHeQiWnjsNRqQs0eNOdq8ifZ/ESfqwmUuk/Ae5SwkYZ8v0xxBRn95 m0qdv0UTRw8sEUoZvIEf8vaKfEcVyevxZfFe7+1Tld4RscQlp5y4I2MQoJsG+Re5xJLV dxIA== X-Gm-Message-State: AO0yUKURbuhxWfEDxEDIpwYEj3eKb6cIvJRUPZ2ZklY0YvKyHVfuVBSp /tMIGSjDDc+jtJn7yyZdaL8nZnQl/t/sjNhe8KY= X-Received: by 2002:a17:90a:1c5:b0:237:39b1:7b7 with SMTP id 5-20020a17090a01c500b0023739b107b7mr5126469pjd.11.1677108447430; Wed, 22 Feb 2023 15:27:27 -0800 (PST) Received: from stoup.. (rrcs-173-198-77-218.west.biz.rr.com. [173.198.77.218]) by smtp.gmail.com with ESMTPSA id s16-20020a17090ad49000b00234e6d2de3dsm5008918pju.11.2023.02.22.15.27.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Feb 2023 15:27:27 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v2 07/28] tcg: Remove TEMP_NORMAL Date: Wed, 22 Feb 2023 13:26:54 -1000 Message-Id: <20230222232715.15034-8-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230222232715.15034-1-richard.henderson@linaro.org> References: <20230222232715.15034-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.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 TEMP_NORMAL is a subset of TEMP_EBB. Promote single basic block temps to single extended basic block. Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson --- include/tcg/tcg.h | 2 -- tcg/tcg.c | 19 +++---------------- 2 files changed, 3 insertions(+), 18 deletions(-) diff --git a/include/tcg/tcg.h b/include/tcg/tcg.h index 2010e746ca..02d5cfc049 100644 --- a/include/tcg/tcg.h +++ b/include/tcg/tcg.h @@ -431,8 +431,6 @@ typedef enum TCGTempVal { } TCGTempVal; typedef enum TCGTempKind { - /* Temp is dead at the end of all basic blocks. */ - TEMP_NORMAL, /* * Temp is dead at the end of the extended basic block (EBB), * the single-entry multiple-exit region that falls through diff --git a/tcg/tcg.c b/tcg/tcg.c index 8d4ce7bd1e..f52e9baf83 100644 --- a/tcg/tcg.c +++ b/tcg/tcg.c @@ -1258,7 +1258,7 @@ TCGTemp *tcg_global_mem_new_internal(TCGType type, TCGv_ptr base, TCGTemp *tcg_temp_new_internal(TCGType type, bool temp_local) { TCGContext *s = tcg_ctx; - TCGTempKind kind = temp_local ? TEMP_TB : TEMP_NORMAL; + TCGTempKind kind = temp_local ? TEMP_TB : TEMP_EBB; TCGTemp *ts; int idx, k; @@ -1368,7 +1368,7 @@ void tcg_temp_free_internal(TCGTemp *ts) * silently ignore free. */ return; - case TEMP_NORMAL: + case TEMP_EBB: case TEMP_TB: break; default: @@ -1384,7 +1384,7 @@ void tcg_temp_free_internal(TCGTemp *ts) #endif idx = temp_idx(ts); - k = ts->base_type + (ts->kind == TEMP_NORMAL ? 0 : TCG_TYPE_COUNT); + k = ts->base_type + (ts->kind == TEMP_EBB ? 0 : TCG_TYPE_COUNT); set_bit(idx, s->free_temps[k].l); } @@ -1911,7 +1911,6 @@ static void tcg_reg_alloc_start(TCGContext *s) break; case TEMP_GLOBAL: break; - case TEMP_NORMAL: case TEMP_EBB: val = TEMP_VAL_DEAD; /* fall through */ @@ -1941,9 +1940,6 @@ static char *tcg_get_arg_str_ptr(TCGContext *s, char *buf, int buf_size, snprintf(buf, buf_size, "loc%d", idx - s->nb_globals); break; case TEMP_EBB: - snprintf(buf, buf_size, "ebb%d", idx - s->nb_globals); - break; - case TEMP_NORMAL: snprintf(buf, buf_size, "tmp%d", idx - s->nb_globals); break; case TEMP_CONST: @@ -2762,7 +2758,6 @@ static void la_bb_end(TCGContext *s, int ng, int nt) case TEMP_TB: state = TS_DEAD | TS_MEM; break; - case TEMP_NORMAL: case TEMP_EBB: case TEMP_CONST: state = TS_DEAD; @@ -2811,9 +2806,6 @@ static void la_bb_sync(TCGContext *s, int ng, int nt) continue; } break; - case TEMP_NORMAL: - s->temps[i].state = TS_DEAD; - break; case TEMP_EBB: case TEMP_CONST: continue; @@ -3568,7 +3560,6 @@ static void temp_free_or_dead(TCGContext *s, TCGTemp *ts, int free_or_dead) case TEMP_TB: new_type = TEMP_VAL_MEM; break; - case TEMP_NORMAL: case TEMP_EBB: new_type = free_or_dead < 0 ? TEMP_VAL_MEM : TEMP_VAL_DEAD; break; @@ -3856,7 +3847,6 @@ static void tcg_reg_alloc_bb_end(TCGContext *s, TCGRegSet allocated_regs) case TEMP_TB: temp_save(s, ts, allocated_regs); break; - case TEMP_NORMAL: case TEMP_EBB: /* The liveness analysis already ensures that temps are dead. Keep an tcg_debug_assert for safety. */ @@ -3893,9 +3883,6 @@ static void tcg_reg_alloc_cbranch(TCGContext *s, TCGRegSet allocated_regs) case TEMP_TB: tcg_debug_assert(ts->val_type != TEMP_VAL_REG || ts->mem_coherent); break; - case TEMP_NORMAL: - tcg_debug_assert(ts->val_type == TEMP_VAL_DEAD); - break; case TEMP_EBB: case TEMP_CONST: break;