From patchwork Mon Jul 17 07:16:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aldy Hernandez X-Patchwork-Id: 121080 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp954363vqt; Mon, 17 Jul 2023 00:19:20 -0700 (PDT) X-Google-Smtp-Source: APBJJlEsVet9pDPZMzG9AiqkTwHAlWqx4FcC/w86YV2+6648dHrIFzsQkoy2O2YLB4OGL20W6UHK X-Received: by 2002:a17:907:a428:b0:988:d1d5:cd5b with SMTP id sg40-20020a170907a42800b00988d1d5cd5bmr12380651ejc.75.1689578360374; Mon, 17 Jul 2023 00:19:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689578360; cv=none; d=google.com; s=arc-20160816; b=GeMu/7+GBhPb8zSi36ushpwFptXONZWkmLvFoemDkxqpBqECRETmWnskQCIUYLSIWA eiP5tXzhfXo9WyRHbDKkOU/4WuHVyGhjTYaUqTG8EBMrMHTyEhB+MWkvQiYvqSWrzDrT YAv94AGO54ydorM26WgQF2S7ALUhpXWOs+KQ1LLfhZurtpN5vKw7voT2+9vQZ0E5b7DT RPqCJpOdL6HIccDqkYsjlYcqFnQ7pSaNXrsiAjfjG8j9Q22p9G9rAutx1I+poqJatQEh ega+g4CAXoV3j9Nzx+wD/qGpyjfQoWODFF3mUrohyJ8Vqykq/tnwJw7eU/sLyuth585d 8pmA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence :content-transfer-encoding:mime-version:message-id:date:subject:cc :to:dmarc-filter:delivered-to:dkim-signature:dkim-filter; bh=BLiVAIus14TolX5Wmapi34CT+euejsOQfrxBw7l8yqs=; fh=96E5hNVsweIFOeUztpxi6Fa1ymOnLCviJJ16c5FIeFk=; b=T4AKOMOFdt5Z/vLGbPhO8fxtu1o8nohTAimXhWhXPZ1rNzGrsBxNDGeEjCS0BICXDZ /IU84lJU0D3QDdjw6VTttJn5Vaj4w59x+Zvtf/vEt/BFojKh88E1M349CE8cCWpzYfTp PM5bl1mGQaxkqSQ0NVTOi3WyXjQQsMnXWtw/OujLlNBEsFNBAJ3CXvuNp/fEibAsMnbW mtKkvCZy4mpUXzNqAOfM2rlYrYPwqE6o8QagB3bbWxS9ZJzHqm3Q5cKSdfrV6wOJKTEh XW1JsUWeEqGglT8Au4j0c9KKYjtsA0W0ZyGyTAtTzvmp2fEtI0VpRdQhF3IblU30vaOw Gx4g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=F6rBMDoX; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (ip-8-43-85-97.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id a17-20020a170906191100b00991c46d0bb6si12517741eje.93.2023.07.17.00.19.20 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Jul 2023 00:19:20 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=F6rBMDoX; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 36B773855593 for ; Mon, 17 Jul 2023 07:18:32 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 36B773855593 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1689578312; bh=BLiVAIus14TolX5Wmapi34CT+euejsOQfrxBw7l8yqs=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=F6rBMDoXaxPI4Da5dXprMBbHbqtAon9L427Bcabjdsgz/7XXGP73JIAD5KU3Ym6m7 1cY470wdc9QQWjrwHjMd6qj6ClM08gI8A8eSBxPx3KVZI2NT+ruKADRDDA2+j94M6n AF+4PeWsK1gGvXqOobwEU3IgPtSgdr+4j/ucrQ8s= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id 8CBC83858D1E for ; Mon, 17 Jul 2023 07:17:48 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 8CBC83858D1E Received: from mimecast-mx02.redhat.com (66.187.233.73 [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-610-uGDvfMAYOmixs6VEAZwGvQ-1; Mon, 17 Jul 2023 03:17:45 -0400 X-MC-Unique: uGDvfMAYOmixs6VEAZwGvQ-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 71338380392D for ; Mon, 17 Jul 2023 07:17:45 +0000 (UTC) Received: from abulafia.quesejoda.com (unknown [10.39.193.153]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1BB5240C2063; Mon, 17 Jul 2023 07:17:44 +0000 (UTC) Received: from abulafia.quesejoda.com (localhost [127.0.0.1]) by abulafia.quesejoda.com (8.17.1/8.17.1) with ESMTPS id 36H7HgAj242463 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Mon, 17 Jul 2023 09:17:42 +0200 Received: (from aldyh@localhost) by abulafia.quesejoda.com (8.17.1/8.17.1/Submit) id 36H7HgO0242462; Mon, 17 Jul 2023 09:17:42 +0200 To: GCC patches Cc: Andrew MacLeod , Aldy Hernandez Subject: [COMMITTED] Normalize irange_bitmask before union/intersect. Date: Mon, 17 Jul 2023 09:16:02 +0200 Message-Id: <20230717071603.242424-1-aldyh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-11.7 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Aldy Hernandez via Gcc-patches From: Aldy Hernandez Reply-To: Aldy Hernandez Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771651319093129041 X-GMAIL-MSGID: 1771651319093129041 The bit twiddling in union/intersect for the value/mask pair must be normalized to have the unknown bits with a value of 0 in order to make the math simpler. Normalizing at construction slowed VRP by 1.5% so I opted to normalize before updating the bitmask in range-ops, since it was the only user. However, with upcoming changes there will be multiple setters of the mask (IPA and CCP), so we need something more general. I played with various alternatives, and settled on normalizing before union/intersect which were the ones needing the bits cleared. With this patch, there's no noticeable difference in performance either in VRP or in overall compilation. gcc/ChangeLog: * value-range.cc (irange_bitmask::verify_mask): Mask need not be normalized. * value-range.h (irange_bitmask::union_): Normalize beforehand. (irange_bitmask::intersect): Same. --- gcc/value-range.cc | 3 --- gcc/value-range.h | 12 ++++++++++-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/gcc/value-range.cc b/gcc/value-range.cc index 011bdbdeae6..2abf57bcee8 100644 --- a/gcc/value-range.cc +++ b/gcc/value-range.cc @@ -1953,9 +1953,6 @@ void irange_bitmask::verify_mask () const { gcc_assert (m_value.get_precision () == m_mask.get_precision ()); - // Unknown bits must have their corresponding value bits cleared as - // it simplifies union and intersect. - gcc_assert (wi::bit_and (m_mask, m_value) == 0); } void diff --git a/gcc/value-range.h b/gcc/value-range.h index 0170188201b..d8af6fca7d7 100644 --- a/gcc/value-range.h +++ b/gcc/value-range.h @@ -211,8 +211,12 @@ irange_bitmask::operator== (const irange_bitmask &src) const } inline bool -irange_bitmask::union_ (const irange_bitmask &src) +irange_bitmask::union_ (const irange_bitmask &orig_src) { + // Normalize mask. + irange_bitmask src (orig_src.m_value & ~orig_src.m_mask, orig_src.m_mask); + m_value &= ~m_mask; + irange_bitmask save (*this); m_mask = (m_mask | src.m_mask) | (m_value ^ src.m_value); m_value = m_value & src.m_value; @@ -222,8 +226,12 @@ irange_bitmask::union_ (const irange_bitmask &src) } inline bool -irange_bitmask::intersect (const irange_bitmask &src) +irange_bitmask::intersect (const irange_bitmask &orig_src) { + // Normalize mask. + irange_bitmask src (orig_src.m_value & ~orig_src.m_mask, orig_src.m_mask); + m_value &= ~m_mask; + irange_bitmask save (*this); // If we have two known bits that are incompatible, the resulting // bit is undefined. It is unclear whether we should set the entire