From patchwork Thu Apr 1 16:54:07 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: 1461191 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=gcc-patches-bounces@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=YOAF1RYP; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4FB8RG2KDzz9sVt for ; Fri, 2 Apr 2021 03:54:17 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id B39D03844012; Thu, 1 Apr 2021 16:54:14 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B39D03844012 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1617296054; bh=/qt27AXL9nrzW6ZTJWf6pRUznc86VXS3IUYLyYz1NiA=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=YOAF1RYPhqhGAvRpunVTiTn7+aVQpl4dlsgTd6Om1fXJC7fi4FuU0idiflUXh3Wx9 Nnp3Xgqyo8CIGcQ6XOtSJ1l1aZe1X/zePgQI0LW2m2AwUdK+hDcYLsd4PCLXMfFFRC SnQYfx2rCwTsqnVoBLbYxDM//fLPsnm5BZ9WVtK8= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-pg1-x52d.google.com (mail-pg1-x52d.google.com [IPv6:2607:f8b0:4864:20::52d]) by sourceware.org (Postfix) with ESMTPS id 429F83844012 for ; Thu, 1 Apr 2021 16:54:12 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 429F83844012 Received: by mail-pg1-x52d.google.com with SMTP id h25so1930746pgm.3 for ; Thu, 01 Apr 2021 09:54:12 -0700 (PDT) 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:mime-version :content-transfer-encoding; bh=/qt27AXL9nrzW6ZTJWf6pRUznc86VXS3IUYLyYz1NiA=; b=ABgfv6D2SYoXOWTmVYXpBLqWfknsa86vZyRJAK3xiPFEC5sP1lpMwHUJh1Lx0IdnVn sUTXfMeCXTfvuv50u+D9ND9/YSUco4LKvrUgbOWzlPzO91EV1ewFvjercmiO5nX/TUal MVoXT27T0W3VdZzIY/hG5AkPubwPWd/w6XDQtgxrZfpCFlgyt9N0+NMccNCodEx6N/Bx BZyYq1LGssxQxTg2WaO54lfUk60TV5txSd/pNvVhrX+hPPpNq+m1tLs9q5wh2pUB5psf ZM90IOA4wHoafV06+UqEM7rGkw0vKUOERcCqDb+PnIraXxJ66dduVzZv+KJlAt3tWPVP sxnA== X-Gm-Message-State: AOAM530rD3s67/6spevPqehWZkw7bDxk45KYi3iYiaQ+QbzUUxkVixmw yx1XioL1fQcr8o5BV5VP/d6/iOl9LVTf9g== X-Google-Smtp-Source: ABdhPJxW8W8JnqdjIf19Yctv6lYD4bz7B6NlYc8vSOIQL/78rX7gOvk6pPlJXZST3RI+q7d3KVxsfw== X-Received: by 2002:a63:338e:: with SMTP id z136mr8291169pgz.115.1617296050015; Thu, 01 Apr 2021 09:54:10 -0700 (PDT) Received: from gnu-cfl-2.localdomain ([2607:fb90:a62d:2d5e:38da:e56e:0:c66]) by smtp.gmail.com with ESMTPSA id 22sm6067558pjl.31.2021.04.01.09.54.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Apr 2021 09:54:09 -0700 (PDT) Received: from gnu-cfl-2.lan (localhost [IPv6:::1]) by gnu-cfl-2.localdomain (Postfix) with ESMTP id E0C411A0401; Thu, 1 Apr 2021 09:54:07 -0700 (PDT) To: gcc-patches@gcc.gnu.org Subject: [PATCH] x86: Don't generate uiret with -mcmodel=kernel Date: Thu, 1 Apr 2021 09:54:07 -0700 Message-Id: <20210401165407.903729-1-hjl.tools@gmail.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-Spam-Status: No, score=-3036.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) 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" Errors-To: gcc-patches-bounces@gcc.gnu.org Sender: "Gcc-patches" Since uiret should be used only for user interrupt handler return, don't generate uiret in interrupt handler return with -mcmodel=kernel even if UINTR is enabled. gcc/ PR target/99870 * config/i386/i386.md (interrupt_return): Don't generate uiret for -mcmodel=kernel. gcc/testsuite/ * gcc.target/i386/pr99870.c: New test. --- gcc/config/i386/i386.md | 3 ++- gcc/testsuite/gcc.target/i386/pr99870.c | 19 +++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gcc.target/i386/pr99870.c diff --git a/gcc/config/i386/i386.md b/gcc/config/i386/i386.md index 9ff35d9a607..1055b4187b2 100644 --- a/gcc/config/i386/i386.md +++ b/gcc/config/i386/i386.md @@ -13885,7 +13885,8 @@ (define_insn "interrupt_return" (unspec [(const_int 0)] UNSPEC_INTERRUPT_RETURN)] "reload_completed" { - return TARGET_64BIT ? (TARGET_UINTR ? "uiret" : "iretq") : "iret"; + return TARGET_64BIT ? ((TARGET_UINTR && ix86_cmodel != CM_KERNEL) + ? "uiret" : "iretq") : "iret"; }) ;; Used by x86_machine_dependent_reorg to avoid penalty on single byte RET diff --git a/gcc/testsuite/gcc.target/i386/pr99870.c b/gcc/testsuite/gcc.target/i386/pr99870.c new file mode 100644 index 00000000000..0dafa001ba9 --- /dev/null +++ b/gcc/testsuite/gcc.target/i386/pr99870.c @@ -0,0 +1,19 @@ +/* { dg-do compile } */ +/* { dg-options "-O2 -march=sapphirerapids -mgeneral-regs-only" } */ +/* { dg-additional-options "-mcmodel=kernel" { target { ! ia32 } } } */ + +void +__attribute__((interrupt)) +fn (void *frame) +{ +} + +typedef void (*fn_t) (void *) __attribute__((interrupt)); + +fn_t fns[] = +{ + fn, +}; + +/* { dg-final { scan-assembler-times "\\tiret" 1 { target ia32 } } } */ +/* { dg-final { scan-assembler-times "\\tiretq" 1 { target { ! ia32 } } } } */