From patchwork Sat Dec 25 14:28:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 49254 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id A49F1385842B for ; Sat, 25 Dec 2021 14:29:24 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A49F1385842B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1640442564; bh=kasqXII6ubhBjehdpXwsbiKKdEGWw5+fWuPhT5JVipA=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=qHbAwNeQdMgs58jHlBvrDV/xM1pmvduqvvM16gosKZzcFAbui4sTxtz8clldUal6e 8QIfzwjy5WqGObQHpcrsgK/NegBOD0lBEScywuti12gJNJ3THrWT49b21bETnBq3rR IlV5J74OHqQGBlLOwvz792r5f19ULpSmlkmTeK1E= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-pj1-x102e.google.com (mail-pj1-x102e.google.com [IPv6:2607:f8b0:4864:20::102e]) by sourceware.org (Postfix) with ESMTPS id 420CF3858C27 for ; Sat, 25 Dec 2021 14:28:56 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 420CF3858C27 Received: by mail-pj1-x102e.google.com with SMTP id jw3so9724008pjb.4 for ; Sat, 25 Dec 2021 06:28:56 -0800 (PST) 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:mime-version :content-transfer-encoding; bh=kasqXII6ubhBjehdpXwsbiKKdEGWw5+fWuPhT5JVipA=; b=luaYSQVZr37frNOjujnp+omPHpEngtO2ePJjAk3pmFRTveKy9WGYYyACRFINGrOZNd tNIxkgr9dW9EgGOLRivaoHREKmfOeUAI4+Csl85rBW8eMaSGPvZDw214BGMBDoj3tZwK 6vtqGaoJ37LhunSPGON4xblAjEBTYpRfRWF93k9KArUult62o1G8VEHEQDE/kRLxwNjY /iQx1e8HgDgofKZQzBlOPX/NIZXozGW9CFqENqFEMWMQ28jfAvcXolrYJgzp8ePTYqcH t8csLzWn+20nJ9t6YqqUIQkpJbVewFsDQOSE8gM9cW5GbSrqIBKB3CynatrifbTkVKEs jiTg== X-Gm-Message-State: AOAM530UtUiJt4CyBRlGqgtwjb/wfwzlXkE52t56pVC1RB17PhWEk7i1 fYY9hp5OYV/LUXI/gKjO/grLnrNDsOQ= X-Google-Smtp-Source: ABdhPJz/qwmMptPTW1hhEuXtrLt4zp5RNF9TCPaEz7d3ztqUwyffXVTOaCVFy3ZVVIBBU5JJ+AKlBg== X-Received: by 2002:a17:902:ed85:b0:148:9d8d:2aa2 with SMTP id e5-20020a170902ed8500b001489d8d2aa2mr10341469plj.81.1640442534845; Sat, 25 Dec 2021 06:28:54 -0800 (PST) Received: from gnu-tgl-3.localdomain ([172.58.35.133]) by smtp.gmail.com with ESMTPSA id t10sm12746643pfg.105.2021.12.25.06.28.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Dec 2021 06:28:54 -0800 (PST) Received: from gnu-tgl-3.. (localhost [IPv6:::1]) by gnu-tgl-3.localdomain (Postfix) with ESMTP id 65F29C019C; Sat, 25 Dec 2021 06:28:53 -0800 (PST) To: gcc-patches@gcc.gnu.org Subject: [PATCH v3] i386: Check AX input in any_mul_highpart peepholes Date: Sat, 25 Dec 2021 06:28:53 -0800 Message-Id: <20211225142853.154884-1-hjl.tools@gmail.com> X-Mailer: git-send-email 2.33.1 MIME-Version: 1.0 X-Spam-Status: No, score=-3029.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, KAM_SHORT, RCVD_IN_BARRACUDACENTRAL, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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: "H.J. Lu via Gcc-patches" From: "H.J. Lu" Reply-To: "H.J. Lu" Cc: Roger Sayle Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" When applying peephole optimization to transform mov imm, %reg0 mov %reg1, %AX_REG imul %reg0 to mov imm, %AX_REG imul %reg1 disable peephole optimization if reg1 == AX_REG. gcc/ PR bootstrap/103785 * config/i386/i386.md: Swap operand order in comments and check AX input in any_mul_highpart peepholes. gcc/testsuite/ PR bootstrap/103785 * gcc.target/i386/pr103785.c: New test. --- gcc/config/i386/i386.md | 9 ++++-- gcc/testsuite/gcc.target/i386/pr103785.c | 38 ++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 3 deletions(-) create mode 100644 gcc/testsuite/gcc.target/i386/pr103785.c diff --git a/gcc/config/i386/i386.md b/gcc/config/i386/i386.md index 284b9507466..1c1ec227f71 100644 --- a/gcc/config/i386/i386.md +++ b/gcc/config/i386/i386.md @@ -8578,7 +8578,7 @@ (set_attr "mode" "SI")]) ;; Highpart multiplication peephole2s to tweak register allocation. -;; mov %rdx,imm; mov %rax,%rdi; imulq %rdx -> mov %rax,imm; imulq %rdi +;; mov imm,%rdx; mov %rdi,%rax; imulq %rdx -> mov imm,%rax; imulq %rdi (define_peephole2 [(set (match_operand:SWI48 0 "general_reg_operand") (match_operand:SWI48 1 "immediate_operand")) @@ -8588,7 +8588,8 @@ (any_mul_highpart:SWI48 (match_dup 2) (match_dup 0))) (clobber (match_dup 2)) (clobber (reg:CC FLAGS_REG))])] - "REGNO (operands[0]) != REGNO (operands[2]) + "REGNO (operands[3]) != AX_REG + && REGNO (operands[0]) != REGNO (operands[2]) && REGNO (operands[0]) != REGNO (operands[3]) && (REGNO (operands[0]) == REGNO (operands[4]) || peep2_reg_dead_p (3, operands[0]))" @@ -8608,7 +8609,9 @@ (any_mul_highpart:SI (match_dup 2) (match_dup 0)))) (clobber (match_dup 2)) (clobber (reg:CC FLAGS_REG))])] - "REGNO (operands[0]) != REGNO (operands[2]) + "REGNO (operands[3]) != AX_REG + && REGNO (operands[0]) != REGNO (operands[2]) + && REGNO (operands[2]) != REGNO (operands[3]) && REGNO (operands[0]) != REGNO (operands[3]) && (REGNO (operands[0]) == REGNO (operands[4]) || peep2_reg_dead_p (3, operands[0]))" diff --git a/gcc/testsuite/gcc.target/i386/pr103785.c b/gcc/testsuite/gcc.target/i386/pr103785.c new file mode 100644 index 00000000000..5503b965256 --- /dev/null +++ b/gcc/testsuite/gcc.target/i386/pr103785.c @@ -0,0 +1,38 @@ +/* { dg-do run } */ +/* { dg-options "-O2" } */ + +#include + +struct wrapper_t +{ + long k; + long e; +}; + +struct wrapper_t **table; + +__attribute__ ((weak, regparm (2))) +void +update (long k, long e) +{ + struct wrapper_t *elmt; + + elmt = table[k % 3079]; + if (elmt == 0) + return; + elmt->e = e; +} + +int +main () +{ + table = (struct wrapper_t **) malloc (20 * sizeof (struct wrapper_t *)); + for (int i = 0; i < 20; i++) + table[i] = (struct wrapper_t *) calloc (sizeof (struct wrapper_t), 1); + if (table[10]->e != 0) + abort (); + update (10, 20); + if (table[10]->e != 20) + abort (); + return 0; +}