| Message ID | 20220620080442.735284-1-haochen.jiang@intel.com |
|---|---|
| State | New |
| Headers |
Return-Path: <gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org> 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 1656B3858281 for <patchwork@sourceware.org>; Mon, 20 Jun 2022 08:06:16 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1656B3858281 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1655712376; bh=+ppFr9HEcFLJZd+e+FWpzT5Z9l59AvRSEKSzFYeAvQk=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=UPeEYZa/JULxWikPGdQgHnGq2q84U3RROaCyk+SyVOkvJdkKj6U3i2mCvOzzLFu5z HlSWJN3JGjdRZ5muKCjdxu7b8xZxMcbB2dBHyiNUTnvC1BAwQfSypvqumELpE0H3Jd jD+C6lFF7kOWiHwJnlPBIpea4ixIrk767WrvGj8o= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by sourceware.org (Postfix) with ESMTPS id 6068038582AF for <gcc-patches@gcc.gnu.org>; Mon, 20 Jun 2022 08:04:45 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 6068038582AF X-IronPort-AV: E=McAfee;i="6400,9594,10380"; a="279883279" X-IronPort-AV: E=Sophos;i="5.92,306,1650956400"; d="scan'208";a="279883279" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Jun 2022 01:04:44 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.92,306,1650956400"; d="scan'208";a="614300386" Received: from scymds01.sc.intel.com ([10.148.94.138]) by orsmga008.jf.intel.com with ESMTP; 20 Jun 2022 01:04:44 -0700 Received: from shliclel314.sh.intel.com (shliclel314.sh.intel.com [10.239.236.214]) by scymds01.sc.intel.com with ESMTP id 25K84gVO017604; Mon, 20 Jun 2022 01:04:42 -0700 To: gcc-patches@gcc.gnu.org Subject: [PATCH] i386: Add syscall to enable AMX for latest kernels Date: Mon, 20 Jun 2022 16:04:42 +0800 Message-Id: <20220620080442.735284-1-haochen.jiang@intel.com> X-Mailer: git-send-email 2.18.2 X-Spam-Status: No, score=-12.6 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, 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 <gcc-patches.gcc.gnu.org> List-Unsubscribe: <https://gcc.gnu.org/mailman/options/gcc-patches>, <mailto:gcc-patches-request@gcc.gnu.org?subject=unsubscribe> List-Archive: <https://gcc.gnu.org/pipermail/gcc-patches/> List-Post: <mailto:gcc-patches@gcc.gnu.org> List-Help: <mailto:gcc-patches-request@gcc.gnu.org?subject=help> List-Subscribe: <https://gcc.gnu.org/mailman/listinfo/gcc-patches>, <mailto:gcc-patches-request@gcc.gnu.org?subject=subscribe> From: Haochen Jiang via Gcc-patches <gcc-patches@gcc.gnu.org> Reply-To: Haochen Jiang <haochen.jiang@intel.com> Cc: hongtao.liu@intel.com, "Jiang, Haochen" <haochen.jiang@intel.com> Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" <gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org> |
| Series |
i386: Add syscall to enable AMX for latest kernels
|
|
Commit Message
Haochen Jiang
June 20, 2022, 8:04 a.m. UTC
From: "Jiang, Haochen" <haochen.jiang@intel.com>
Hi all,
We need syscall to enable AMX for kernels>=5.4. It is missing in current
amx tests, which will cause test fail.
This patch aims to add them to fix this bug.
BRs,
Haochen
gcc/testsuite/ChangeLog:
* gcc.target/i386/amx-check.h (request_perm_xtile_data):
New function to check if AMX is usable and enable AMX.
(main): Run test if AMX is usable.
---
gcc/testsuite/gcc.target/i386/amx-check.h | 24 +++++++++++++++++++++++
1 file changed, 24 insertions(+)
Comments
On Mon, Jun 20, 2022 at 10:04 AM Haochen Jiang <haochen.jiang@intel.com> wrote: > > From: "Jiang, Haochen" <haochen.jiang@intel.com> > > Hi all, > > We need syscall to enable AMX for kernels>=5.4. It is missing in current > amx tests, which will cause test fail. So this new code is only valid for linux & co? Uros. > > This patch aims to add them to fix this bug. > > BRs, > Haochen > > gcc/testsuite/ChangeLog: > > * gcc.target/i386/amx-check.h (request_perm_xtile_data): > New function to check if AMX is usable and enable AMX. > (main): Run test if AMX is usable. > --- > gcc/testsuite/gcc.target/i386/amx-check.h | 24 +++++++++++++++++++++++ > 1 file changed, 24 insertions(+) > > diff --git a/gcc/testsuite/gcc.target/i386/amx-check.h b/gcc/testsuite/gcc.target/i386/amx-check.h > index 434b0e59703..92ed8669304 100644 > --- a/gcc/testsuite/gcc.target/i386/amx-check.h > +++ b/gcc/testsuite/gcc.target/i386/amx-check.h > @@ -4,11 +4,22 @@ > #include <stdlib.h> > #include <string.h> > #include <stdint.h> > +#include <unistd.h> > +#include <sys/syscall.h> > #ifdef DEBUG > #include <stdio.h> > #endif > #include "cpuid.h" > > +#define XFEATURE_XTILECFG 17 > +#define XFEATURE_XTILEDATA 18 > +#define XFEATURE_MASK_XTILECFG (1 << XFEATURE_XTILECFG) > +#define XFEATURE_MASK_XTILEDATA (1 << XFEATURE_XTILEDATA) > +#define XFEATURE_MASK_XTILE (XFEATURE_MASK_XTILECFG | XFEATURE_MASK_XTILEDATA) > + > +#define ARCH_GET_XCOMP_PERM 0x1022 > +#define ARCH_REQ_XCOMP_PERM 0x1023 > + > /* TODO: The tmm emulation is temporary for current > AMX implementation with no tmm regclass, should > be changed in the future. */ > @@ -44,6 +55,18 @@ typedef struct __tile > /* Stride (colum width in byte) used for tileload/store */ > #define _STRIDE 64 > > +/* We need syscall to use amx functions */ > +int request_perm_xtile_data() > +{ > + unsigned long bitmask; > + > + if (syscall (SYS_arch_prctl, ARCH_REQ_XCOMP_PERM, XFEATURE_XTILEDATA) || > + syscall (SYS_arch_prctl, ARCH_GET_XCOMP_PERM, &bitmask)) > + return 0; > + > + return (bitmask & XFEATURE_MASK_XTILE) != 0; > +} > + > /* Initialize tile config by setting all tmm size to 16x64 */ > void init_tile_config (__tilecfg_u *dst) > { > @@ -186,6 +209,7 @@ main () > #ifdef AMX_BF16 > && __builtin_cpu_supports ("amx-bf16") > #endif > + && request_perm_xtile_data () > ) > { > DO_TEST (); > -- > 2.18.2 >
> -----Original Message----- > From: Uros Bizjak <ubizjak@gmail.com> > Sent: Monday, June 20, 2022 10:54 PM > To: Jiang, Haochen <haochen.jiang@intel.com> > Cc: gcc-patches@gcc.gnu.org; Liu, Hongtao <hongtao.liu@intel.com> > Subject: Re: [PATCH] i386: Add syscall to enable AMX for latest kernels > > On Mon, Jun 20, 2022 at 10:04 AM Haochen Jiang <haochen.jiang@intel.com> > wrote: > > > > From: "Jiang, Haochen" <haochen.jiang@intel.com> > > > > Hi all, > > > > We need syscall to enable AMX for kernels>=5.4. It is missing in > > current amx tests, which will cause test fail. > > So this new code is only valid for linux & co? Thanks for reminding me for that, I only test on linux since the header file is only in linux. Just updated a patch wrapping with a macro not to change the behavior on windows. Regtested on x86_64-pc-linux-gnu. Thx, Haochen > > Uros. > > > > > This patch aims to add them to fix this bug. > > > > BRs, > > Haochen > > > > gcc/testsuite/ChangeLog: > > > > * gcc.target/i386/amx-check.h (request_perm_xtile_data): > > New function to check if AMX is usable and enable AMX. > > (main): Run test if AMX is usable. > > --- > > gcc/testsuite/gcc.target/i386/amx-check.h | 24 > > +++++++++++++++++++++++ > > 1 file changed, 24 insertions(+) > > > > diff --git a/gcc/testsuite/gcc.target/i386/amx-check.h > > b/gcc/testsuite/gcc.target/i386/amx-check.h > > index 434b0e59703..92ed8669304 100644 > > --- a/gcc/testsuite/gcc.target/i386/amx-check.h > > +++ b/gcc/testsuite/gcc.target/i386/amx-check.h > > @@ -4,11 +4,22 @@ > > #include <stdlib.h> > > #include <string.h> > > #include <stdint.h> > > +#include <unistd.h> > > +#include <sys/syscall.h> > > #ifdef DEBUG > > #include <stdio.h> > > #endif > > #include "cpuid.h" > > > > +#define XFEATURE_XTILECFG 17 > > +#define XFEATURE_XTILEDATA 18 > > +#define XFEATURE_MASK_XTILECFG (1 << XFEATURE_XTILECFG) > > +#define XFEATURE_MASK_XTILEDATA (1 << XFEATURE_XTILEDATA) > > +#define XFEATURE_MASK_XTILE (XFEATURE_MASK_XTILECFG | > XFEATURE_MASK_XTILEDATA) > > + > > +#define ARCH_GET_XCOMP_PERM 0x1022 > > +#define ARCH_REQ_XCOMP_PERM 0x1023 > > + > > /* TODO: The tmm emulation is temporary for current > > AMX implementation with no tmm regclass, should > > be changed in the future. */ > > @@ -44,6 +55,18 @@ typedef struct __tile > > /* Stride (colum width in byte) used for tileload/store */ #define > > _STRIDE 64 > > > > +/* We need syscall to use amx functions */ int > > +request_perm_xtile_data() { > > + unsigned long bitmask; > > + > > + if (syscall (SYS_arch_prctl, ARCH_REQ_XCOMP_PERM, > XFEATURE_XTILEDATA) || > > + syscall (SYS_arch_prctl, ARCH_GET_XCOMP_PERM, &bitmask)) > > + return 0; > > + > > + return (bitmask & XFEATURE_MASK_XTILE) != 0; } > > + > > /* Initialize tile config by setting all tmm size to 16x64 */ void > > init_tile_config (__tilecfg_u *dst) { @@ -186,6 +209,7 @@ main () > > #ifdef AMX_BF16 > > && __builtin_cpu_supports ("amx-bf16") #endif > > + && request_perm_xtile_data () > > ) > > { > > DO_TEST (); > > -- > > 2.18.2 > >
On Tue, Jun 21, 2022 at 4:23 AM Jiang, Haochen <haochen.jiang@intel.com> wrote: > > > -----Original Message----- > > From: Uros Bizjak <ubizjak@gmail.com> > > Sent: Monday, June 20, 2022 10:54 PM > > To: Jiang, Haochen <haochen.jiang@intel.com> > > Cc: gcc-patches@gcc.gnu.org; Liu, Hongtao <hongtao.liu@intel.com> > > Subject: Re: [PATCH] i386: Add syscall to enable AMX for latest kernels > > > > On Mon, Jun 20, 2022 at 10:04 AM Haochen Jiang <haochen.jiang@intel.com> > > wrote: > > > > > > From: "Jiang, Haochen" <haochen.jiang@intel.com> > > > > > > Hi all, > > > > > > We need syscall to enable AMX for kernels>=5.4. It is missing in > > > current amx tests, which will cause test fail. > > > > So this new code is only valid for linux & co? > > Thanks for reminding me for that, I only test on linux since the header file is only in linux. > > Just updated a patch wrapping with a macro not to change the behavior on windows. I think you want __linux__ there, not __unix__. Uros. > > Regtested on x86_64-pc-linux-gnu. > > Thx, > Haochen > > > > Uros. > > > > > > > > This patch aims to add them to fix this bug. > > > > > > BRs, > > > Haochen > > > > > > gcc/testsuite/ChangeLog: > > > > > > * gcc.target/i386/amx-check.h (request_perm_xtile_data): > > > New function to check if AMX is usable and enable AMX. > > > (main): Run test if AMX is usable. > > > --- > > > gcc/testsuite/gcc.target/i386/amx-check.h | 24 > > > +++++++++++++++++++++++ > > > 1 file changed, 24 insertions(+) > > > > > > diff --git a/gcc/testsuite/gcc.target/i386/amx-check.h > > > b/gcc/testsuite/gcc.target/i386/amx-check.h > > > index 434b0e59703..92ed8669304 100644 > > > --- a/gcc/testsuite/gcc.target/i386/amx-check.h > > > +++ b/gcc/testsuite/gcc.target/i386/amx-check.h > > > @@ -4,11 +4,22 @@ > > > #include <stdlib.h> > > > #include <string.h> > > > #include <stdint.h> > > > +#include <unistd.h> > > > +#include <sys/syscall.h> > > > #ifdef DEBUG > > > #include <stdio.h> > > > #endif > > > #include "cpuid.h" > > > > > > +#define XFEATURE_XTILECFG 17 > > > +#define XFEATURE_XTILEDATA 18 > > > +#define XFEATURE_MASK_XTILECFG (1 << XFEATURE_XTILECFG) > > > +#define XFEATURE_MASK_XTILEDATA (1 << XFEATURE_XTILEDATA) > > > +#define XFEATURE_MASK_XTILE (XFEATURE_MASK_XTILECFG | > > XFEATURE_MASK_XTILEDATA) > > > + > > > +#define ARCH_GET_XCOMP_PERM 0x1022 > > > +#define ARCH_REQ_XCOMP_PERM 0x1023 > > > + > > > /* TODO: The tmm emulation is temporary for current > > > AMX implementation with no tmm regclass, should > > > be changed in the future. */ > > > @@ -44,6 +55,18 @@ typedef struct __tile > > > /* Stride (colum width in byte) used for tileload/store */ #define > > > _STRIDE 64 > > > > > > +/* We need syscall to use amx functions */ int > > > +request_perm_xtile_data() { > > > + unsigned long bitmask; > > > + > > > + if (syscall (SYS_arch_prctl, ARCH_REQ_XCOMP_PERM, > > XFEATURE_XTILEDATA) || > > > + syscall (SYS_arch_prctl, ARCH_GET_XCOMP_PERM, &bitmask)) > > > + return 0; > > > + > > > + return (bitmask & XFEATURE_MASK_XTILE) != 0; } > > > + > > > /* Initialize tile config by setting all tmm size to 16x64 */ void > > > init_tile_config (__tilecfg_u *dst) { @@ -186,6 +209,7 @@ main () > > > #ifdef AMX_BF16 > > > && __builtin_cpu_supports ("amx-bf16") #endif > > > + && request_perm_xtile_data () > > > ) > > > { > > > DO_TEST (); > > > -- > > > 2.18.2 > > >
> -----Original Message----- > From: Uros Bizjak <ubizjak@gmail.com> > Sent: Tuesday, June 21, 2022 3:06 PM > To: Jiang, Haochen <haochen.jiang@intel.com> > Cc: gcc-patches@gcc.gnu.org; Liu, Hongtao <hongtao.liu@intel.com> > Subject: Re: [PATCH] i386: Add syscall to enable AMX for latest kernels > > On Tue, Jun 21, 2022 at 4:23 AM Jiang, Haochen <haochen.jiang@intel.com> > wrote: > > > > > -----Original Message----- > > > From: Uros Bizjak <ubizjak@gmail.com> > > > Sent: Monday, June 20, 2022 10:54 PM > > > To: Jiang, Haochen <haochen.jiang@intel.com> > > > Cc: gcc-patches@gcc.gnu.org; Liu, Hongtao <hongtao.liu@intel.com> > > > Subject: Re: [PATCH] i386: Add syscall to enable AMX for latest > > > kernels > > > > > > On Mon, Jun 20, 2022 at 10:04 AM Haochen Jiang > > > <haochen.jiang@intel.com> > > > wrote: > > > > > > > > From: "Jiang, Haochen" <haochen.jiang@intel.com> > > > > > > > > Hi all, > > > > > > > > We need syscall to enable AMX for kernels>=5.4. It is missing in > > > > current amx tests, which will cause test fail. > > > > > > So this new code is only valid for linux & co? > > > > Thanks for reminding me for that, I only test on linux since the header file is > only in linux. > > > > Just updated a patch wrapping with a macro not to change the behavior on > windows. > > I think you want __linux__ there, not __unix__. Fixed with __linux__. Thx, Haochen > > Uros. > > > > > Regtested on x86_64-pc-linux-gnu. > > > > Thx, > > Haochen > > > > > > Uros. > > > > > > > > > > > This patch aims to add them to fix this bug. > > > > > > > > BRs, > > > > Haochen > > > > > > > > gcc/testsuite/ChangeLog: > > > > > > > > * gcc.target/i386/amx-check.h (request_perm_xtile_data): > > > > New function to check if AMX is usable and enable AMX. > > > > (main): Run test if AMX is usable. > > > > --- > > > > gcc/testsuite/gcc.target/i386/amx-check.h | 24 > > > > +++++++++++++++++++++++ > > > > 1 file changed, 24 insertions(+) > > > > > > > > diff --git a/gcc/testsuite/gcc.target/i386/amx-check.h > > > > b/gcc/testsuite/gcc.target/i386/amx-check.h > > > > index 434b0e59703..92ed8669304 100644 > > > > --- a/gcc/testsuite/gcc.target/i386/amx-check.h > > > > +++ b/gcc/testsuite/gcc.target/i386/amx-check.h > > > > @@ -4,11 +4,22 @@ > > > > #include <stdlib.h> > > > > #include <string.h> > > > > #include <stdint.h> > > > > +#include <unistd.h> > > > > +#include <sys/syscall.h> > > > > #ifdef DEBUG > > > > #include <stdio.h> > > > > #endif > > > > #include "cpuid.h" > > > > > > > > +#define XFEATURE_XTILECFG 17 > > > > +#define XFEATURE_XTILEDATA 18 > > > > +#define XFEATURE_MASK_XTILECFG (1 << XFEATURE_XTILECFG) > > > > +#define XFEATURE_MASK_XTILEDATA (1 << XFEATURE_XTILEDATA) > > > > +#define XFEATURE_MASK_XTILE (XFEATURE_MASK_XTILECFG | > > > XFEATURE_MASK_XTILEDATA) > > > > + > > > > +#define ARCH_GET_XCOMP_PERM 0x1022 > > > > +#define ARCH_REQ_XCOMP_PERM 0x1023 > > > > + > > > > /* TODO: The tmm emulation is temporary for current > > > > AMX implementation with no tmm regclass, should > > > > be changed in the future. */ > > > > @@ -44,6 +55,18 @@ typedef struct __tile > > > > /* Stride (colum width in byte) used for tileload/store */ > > > > #define _STRIDE 64 > > > > > > > > +/* We need syscall to use amx functions */ int > > > > +request_perm_xtile_data() { > > > > + unsigned long bitmask; > > > > + > > > > + if (syscall (SYS_arch_prctl, ARCH_REQ_XCOMP_PERM, > > > XFEATURE_XTILEDATA) || > > > > + syscall (SYS_arch_prctl, ARCH_GET_XCOMP_PERM, &bitmask)) > > > > + return 0; > > > > + > > > > + return (bitmask & XFEATURE_MASK_XTILE) != 0; } > > > > + > > > > /* Initialize tile config by setting all tmm size to 16x64 */ > > > > void init_tile_config (__tilecfg_u *dst) { @@ -186,6 +209,7 @@ > > > > main () #ifdef AMX_BF16 > > > > && __builtin_cpu_supports ("amx-bf16") #endif > > > > + && request_perm_xtile_data () > > > > ) > > > > { > > > > DO_TEST (); > > > > -- > > > > 2.18.2 > > > >
On Tue, Jun 21, 2022 at 9:41 AM Jiang, Haochen <haochen.jiang@intel.com> wrote: > > > -----Original Message----- > > From: Uros Bizjak <ubizjak@gmail.com> > > Sent: Tuesday, June 21, 2022 3:06 PM > > To: Jiang, Haochen <haochen.jiang@intel.com> > > Cc: gcc-patches@gcc.gnu.org; Liu, Hongtao <hongtao.liu@intel.com> > > Subject: Re: [PATCH] i386: Add syscall to enable AMX for latest kernels > > > > On Tue, Jun 21, 2022 at 4:23 AM Jiang, Haochen <haochen.jiang@intel.com> > > wrote: > > > > > > > -----Original Message----- > > > > From: Uros Bizjak <ubizjak@gmail.com> > > > > Sent: Monday, June 20, 2022 10:54 PM > > > > To: Jiang, Haochen <haochen.jiang@intel.com> > > > > Cc: gcc-patches@gcc.gnu.org; Liu, Hongtao <hongtao.liu@intel.com> > > > > Subject: Re: [PATCH] i386: Add syscall to enable AMX for latest > > > > kernels > > > > > > > > On Mon, Jun 20, 2022 at 10:04 AM Haochen Jiang > > > > <haochen.jiang@intel.com> > > > > wrote: > > > > > > > > > > From: "Jiang, Haochen" <haochen.jiang@intel.com> > > > > > > > > > > Hi all, > > > > > > > > > > We need syscall to enable AMX for kernels>=5.4. It is missing in > > > > > current amx tests, which will cause test fail. > > > > > > > > So this new code is only valid for linux & co? > > > > > > Thanks for reminding me for that, I only test on linux since the header file is > > only in linux. > > > > > > Just updated a patch wrapping with a macro not to change the behavior on > > windows. > > > > I think you want __linux__ there, not __unix__. > > Fixed with __linux__. OK. Thanks, Uros. > > Thx, > Haochen > > > > > Uros. > > > > > > > > Regtested on x86_64-pc-linux-gnu. > > > > > > Thx, > > > Haochen > > > > > > > > Uros. > > > > > > > > > > > > > > This patch aims to add them to fix this bug. > > > > > > > > > > BRs, > > > > > Haochen > > > > > > > > > > gcc/testsuite/ChangeLog: > > > > > > > > > > * gcc.target/i386/amx-check.h (request_perm_xtile_data): > > > > > New function to check if AMX is usable and enable AMX. > > > > > (main): Run test if AMX is usable. > > > > > --- > > > > > gcc/testsuite/gcc.target/i386/amx-check.h | 24 > > > > > +++++++++++++++++++++++ > > > > > 1 file changed, 24 insertions(+) > > > > > > > > > > diff --git a/gcc/testsuite/gcc.target/i386/amx-check.h > > > > > b/gcc/testsuite/gcc.target/i386/amx-check.h > > > > > index 434b0e59703..92ed8669304 100644 > > > > > --- a/gcc/testsuite/gcc.target/i386/amx-check.h > > > > > +++ b/gcc/testsuite/gcc.target/i386/amx-check.h > > > > > @@ -4,11 +4,22 @@ > > > > > #include <stdlib.h> > > > > > #include <string.h> > > > > > #include <stdint.h> > > > > > +#include <unistd.h> > > > > > +#include <sys/syscall.h> > > > > > #ifdef DEBUG > > > > > #include <stdio.h> > > > > > #endif > > > > > #include "cpuid.h" > > > > > > > > > > +#define XFEATURE_XTILECFG 17 > > > > > +#define XFEATURE_XTILEDATA 18 > > > > > +#define XFEATURE_MASK_XTILECFG (1 << XFEATURE_XTILECFG) > > > > > +#define XFEATURE_MASK_XTILEDATA (1 << XFEATURE_XTILEDATA) > > > > > +#define XFEATURE_MASK_XTILE (XFEATURE_MASK_XTILECFG | > > > > XFEATURE_MASK_XTILEDATA) > > > > > + > > > > > +#define ARCH_GET_XCOMP_PERM 0x1022 > > > > > +#define ARCH_REQ_XCOMP_PERM 0x1023 > > > > > + > > > > > /* TODO: The tmm emulation is temporary for current > > > > > AMX implementation with no tmm regclass, should > > > > > be changed in the future. */ > > > > > @@ -44,6 +55,18 @@ typedef struct __tile > > > > > /* Stride (colum width in byte) used for tileload/store */ > > > > > #define _STRIDE 64 > > > > > > > > > > +/* We need syscall to use amx functions */ int > > > > > +request_perm_xtile_data() { > > > > > + unsigned long bitmask; > > > > > + > > > > > + if (syscall (SYS_arch_prctl, ARCH_REQ_XCOMP_PERM, > > > > XFEATURE_XTILEDATA) || > > > > > + syscall (SYS_arch_prctl, ARCH_GET_XCOMP_PERM, &bitmask)) > > > > > + return 0; > > > > > + > > > > > + return (bitmask & XFEATURE_MASK_XTILE) != 0; } > > > > > + > > > > > /* Initialize tile config by setting all tmm size to 16x64 */ > > > > > void init_tile_config (__tilecfg_u *dst) { @@ -186,6 +209,7 @@ > > > > > main () #ifdef AMX_BF16 > > > > > && __builtin_cpu_supports ("amx-bf16") #endif > > > > > + && request_perm_xtile_data () > > > > > ) > > > > > { > > > > > DO_TEST (); > > > > > -- > > > > > 2.18.2 > > > > >
Hi all, I would like to backport this patch to GCC 12 release branch as machines with the version of default GCC is 12.x (which is always using newer kernels), if the patch is not backported, the amx tests will always fail. Ok for backport? BRs, Haochen > -----Original Message----- > From: Uros Bizjak <ubizjak@gmail.com> > Sent: Tuesday, June 21, 2022 10:53 PM > To: Jiang, Haochen <haochen.jiang@intel.com> > Cc: gcc-patches@gcc.gnu.org; Liu, Hongtao <hongtao.liu@intel.com> > Subject: Re: [PATCH] i386: Add syscall to enable AMX for latest kernels > > On Tue, Jun 21, 2022 at 9:41 AM Jiang, Haochen <haochen.jiang@intel.com> > wrote: > > > > > -----Original Message----- > > > From: Uros Bizjak <ubizjak@gmail.com> > > > Sent: Tuesday, June 21, 2022 3:06 PM > > > To: Jiang, Haochen <haochen.jiang@intel.com> > > > Cc: gcc-patches@gcc.gnu.org; Liu, Hongtao <hongtao.liu@intel.com> > > > Subject: Re: [PATCH] i386: Add syscall to enable AMX for latest > > > kernels > > > > > > On Tue, Jun 21, 2022 at 4:23 AM Jiang, Haochen > > > <haochen.jiang@intel.com> > > > wrote: > > > > > > > > > -----Original Message----- > > > > > From: Uros Bizjak <ubizjak@gmail.com> > > > > > Sent: Monday, June 20, 2022 10:54 PM > > > > > To: Jiang, Haochen <haochen.jiang@intel.com> > > > > > Cc: gcc-patches@gcc.gnu.org; Liu, Hongtao > > > > > <hongtao.liu@intel.com> > > > > > Subject: Re: [PATCH] i386: Add syscall to enable AMX for latest > > > > > kernels > > > > > > > > > > On Mon, Jun 20, 2022 at 10:04 AM Haochen Jiang > > > > > <haochen.jiang@intel.com> > > > > > wrote: > > > > > > > > > > > > From: "Jiang, Haochen" <haochen.jiang@intel.com> > > > > > > > > > > > > Hi all, > > > > > > > > > > > > We need syscall to enable AMX for kernels>=5.4. It is missing > > > > > > in current amx tests, which will cause test fail. > > > > > > > > > > So this new code is only valid for linux & co? > > > > > > > > Thanks for reminding me for that, I only test on linux since the > > > > header file is > > > only in linux. > > > > > > > > Just updated a patch wrapping with a macro not to change the > > > > behavior on > > > windows. > > > > > > I think you want __linux__ there, not __unix__. > > > > Fixed with __linux__. > > OK. > > Thanks, > Uros. > > > > > Thx, > > Haochen > > > > > > > > Uros. > > > > > > > > > > > Regtested on x86_64-pc-linux-gnu. > > > > > > > > Thx, > > > > Haochen > > > > > > > > > > Uros. > > > > > > > > > > > > > > > > > This patch aims to add them to fix this bug. > > > > > > > > > > > > BRs, > > > > > > Haochen > > > > > > > > > > > > gcc/testsuite/ChangeLog: > > > > > > > > > > > > * gcc.target/i386/amx-check.h (request_perm_xtile_data): > > > > > > New function to check if AMX is usable and enable AMX. > > > > > > (main): Run test if AMX is usable. > > > > > > --- > > > > > > gcc/testsuite/gcc.target/i386/amx-check.h | 24 > > > > > > +++++++++++++++++++++++ > > > > > > 1 file changed, 24 insertions(+) > > > > > > > > > > > > diff --git a/gcc/testsuite/gcc.target/i386/amx-check.h > > > > > > b/gcc/testsuite/gcc.target/i386/amx-check.h > > > > > > index 434b0e59703..92ed8669304 100644 > > > > > > --- a/gcc/testsuite/gcc.target/i386/amx-check.h > > > > > > +++ b/gcc/testsuite/gcc.target/i386/amx-check.h > > > > > > @@ -4,11 +4,22 @@ > > > > > > #include <stdlib.h> > > > > > > #include <string.h> > > > > > > #include <stdint.h> > > > > > > +#include <unistd.h> > > > > > > +#include <sys/syscall.h> > > > > > > #ifdef DEBUG > > > > > > #include <stdio.h> > > > > > > #endif > > > > > > #include "cpuid.h" > > > > > > > > > > > > +#define XFEATURE_XTILECFG 17 > > > > > > +#define XFEATURE_XTILEDATA 18 > > > > > > +#define XFEATURE_MASK_XTILECFG (1 << XFEATURE_XTILECFG) > > > > > > +#define XFEATURE_MASK_XTILEDATA (1 << XFEATURE_XTILEDATA) > > > > > > +#define XFEATURE_MASK_XTILE (XFEATURE_MASK_XTILECFG | > > > > > XFEATURE_MASK_XTILEDATA) > > > > > > + > > > > > > +#define ARCH_GET_XCOMP_PERM 0x1022 > > > > > > +#define ARCH_REQ_XCOMP_PERM 0x1023 > > > > > > + > > > > > > /* TODO: The tmm emulation is temporary for current > > > > > > AMX implementation with no tmm regclass, should > > > > > > be changed in the future. */ @@ -44,6 +55,18 @@ typedef > > > > > > struct __tile > > > > > > /* Stride (colum width in byte) used for tileload/store */ > > > > > > #define _STRIDE 64 > > > > > > > > > > > > +/* We need syscall to use amx functions */ int > > > > > > +request_perm_xtile_data() { > > > > > > + unsigned long bitmask; > > > > > > + > > > > > > + if (syscall (SYS_arch_prctl, ARCH_REQ_XCOMP_PERM, > > > > > XFEATURE_XTILEDATA) || > > > > > > + syscall (SYS_arch_prctl, ARCH_GET_XCOMP_PERM, &bitmask)) > > > > > > + return 0; > > > > > > + > > > > > > + return (bitmask & XFEATURE_MASK_XTILE) != 0; } > > > > > > + > > > > > > /* Initialize tile config by setting all tmm size to 16x64 */ > > > > > > void init_tile_config (__tilecfg_u *dst) { @@ -186,6 +209,7 > > > > > > @@ main () #ifdef AMX_BF16 > > > > > > && __builtin_cpu_supports ("amx-bf16") #endif > > > > > > + && request_perm_xtile_data () > > > > > > ) > > > > > > { > > > > > > DO_TEST (); > > > > > > -- > > > > > > 2.18.2 > > > > > >
> -----Original Message----- > From: Jiang, Haochen <haochen.jiang@intel.com> > Sent: Thursday, September 22, 2022 2:23 PM > To: Uros Bizjak <ubizjak@gmail.com> > Cc: gcc-patches@gcc.gnu.org; Liu, Hongtao <hongtao.liu@intel.com> > Subject: RE: [PATCH] i386: Add syscall to enable AMX for latest kernels > > Hi all, > > I would like to backport this patch to GCC 12 release branch as machines with > the version of default GCC is 12.x (which is always using newer kernels), if the > patch is not backported, the amx tests will always fail. > > Ok for backport? Ok. > > BRs, > Haochen > > > -----Original Message----- > > From: Uros Bizjak <ubizjak@gmail.com> > > Sent: Tuesday, June 21, 2022 10:53 PM > > To: Jiang, Haochen <haochen.jiang@intel.com> > > Cc: gcc-patches@gcc.gnu.org; Liu, Hongtao <hongtao.liu@intel.com> > > Subject: Re: [PATCH] i386: Add syscall to enable AMX for latest > > kernels > > > > On Tue, Jun 21, 2022 at 9:41 AM Jiang, Haochen > > <haochen.jiang@intel.com> > > wrote: > > > > > > > -----Original Message----- > > > > From: Uros Bizjak <ubizjak@gmail.com> > > > > Sent: Tuesday, June 21, 2022 3:06 PM > > > > To: Jiang, Haochen <haochen.jiang@intel.com> > > > > Cc: gcc-patches@gcc.gnu.org; Liu, Hongtao <hongtao.liu@intel.com> > > > > Subject: Re: [PATCH] i386: Add syscall to enable AMX for latest > > > > kernels > > > > > > > > On Tue, Jun 21, 2022 at 4:23 AM Jiang, Haochen > > > > <haochen.jiang@intel.com> > > > > wrote: > > > > > > > > > > > -----Original Message----- > > > > > > From: Uros Bizjak <ubizjak@gmail.com> > > > > > > Sent: Monday, June 20, 2022 10:54 PM > > > > > > To: Jiang, Haochen <haochen.jiang@intel.com> > > > > > > Cc: gcc-patches@gcc.gnu.org; Liu, Hongtao > > > > > > <hongtao.liu@intel.com> > > > > > > Subject: Re: [PATCH] i386: Add syscall to enable AMX for > > > > > > latest kernels > > > > > > > > > > > > On Mon, Jun 20, 2022 at 10:04 AM Haochen Jiang > > > > > > <haochen.jiang@intel.com> > > > > > > wrote: > > > > > > > > > > > > > > From: "Jiang, Haochen" <haochen.jiang@intel.com> > > > > > > > > > > > > > > Hi all, > > > > > > > > > > > > > > We need syscall to enable AMX for kernels>=5.4. It is > > > > > > > missing in current amx tests, which will cause test fail. > > > > > > > > > > > > So this new code is only valid for linux & co? > > > > > > > > > > Thanks for reminding me for that, I only test on linux since the > > > > > header file is > > > > only in linux. > > > > > > > > > > Just updated a patch wrapping with a macro not to change the > > > > > behavior on > > > > windows. > > > > > > > > I think you want __linux__ there, not __unix__. > > > > > > Fixed with __linux__. > > > > OK. > > > > Thanks, > > Uros. > > > > > > > > Thx, > > > Haochen > > > > > > > > > > > Uros. > > > > > > > > > > > > > > Regtested on x86_64-pc-linux-gnu. > > > > > > > > > > Thx, > > > > > Haochen > > > > > > > > > > > > Uros. > > > > > > > > > > > > > > > > > > > > This patch aims to add them to fix this bug. > > > > > > > > > > > > > > BRs, > > > > > > > Haochen > > > > > > > > > > > > > > gcc/testsuite/ChangeLog: > > > > > > > > > > > > > > * gcc.target/i386/amx-check.h (request_perm_xtile_data): > > > > > > > New function to check if AMX is usable and enable AMX. > > > > > > > (main): Run test if AMX is usable. > > > > > > > --- > > > > > > > gcc/testsuite/gcc.target/i386/amx-check.h | 24 > > > > > > > +++++++++++++++++++++++ > > > > > > > 1 file changed, 24 insertions(+) > > > > > > > > > > > > > > diff --git a/gcc/testsuite/gcc.target/i386/amx-check.h > > > > > > > b/gcc/testsuite/gcc.target/i386/amx-check.h > > > > > > > index 434b0e59703..92ed8669304 100644 > > > > > > > --- a/gcc/testsuite/gcc.target/i386/amx-check.h > > > > > > > +++ b/gcc/testsuite/gcc.target/i386/amx-check.h > > > > > > > @@ -4,11 +4,22 @@ > > > > > > > #include <stdlib.h> > > > > > > > #include <string.h> > > > > > > > #include <stdint.h> > > > > > > > +#include <unistd.h> > > > > > > > +#include <sys/syscall.h> > > > > > > > #ifdef DEBUG > > > > > > > #include <stdio.h> > > > > > > > #endif > > > > > > > #include "cpuid.h" > > > > > > > > > > > > > > +#define XFEATURE_XTILECFG 17 > > > > > > > +#define XFEATURE_XTILEDATA 18 > > > > > > > +#define XFEATURE_MASK_XTILECFG (1 << XFEATURE_XTILECFG) > > > > > > > +#define XFEATURE_MASK_XTILEDATA (1 << > XFEATURE_XTILEDATA) > > > > > > > +#define XFEATURE_MASK_XTILE (XFEATURE_MASK_XTILECFG | > > > > > > XFEATURE_MASK_XTILEDATA) > > > > > > > + > > > > > > > +#define ARCH_GET_XCOMP_PERM 0x1022 > > > > > > > +#define ARCH_REQ_XCOMP_PERM 0x1023 > > > > > > > + > > > > > > > /* TODO: The tmm emulation is temporary for current > > > > > > > AMX implementation with no tmm regclass, should > > > > > > > be changed in the future. */ @@ -44,6 +55,18 @@ typedef > > > > > > > struct __tile > > > > > > > /* Stride (colum width in byte) used for tileload/store */ > > > > > > > #define _STRIDE 64 > > > > > > > > > > > > > > +/* We need syscall to use amx functions */ int > > > > > > > +request_perm_xtile_data() { > > > > > > > + unsigned long bitmask; > > > > > > > + > > > > > > > + if (syscall (SYS_arch_prctl, ARCH_REQ_XCOMP_PERM, > > > > > > XFEATURE_XTILEDATA) || > > > > > > > + syscall (SYS_arch_prctl, ARCH_GET_XCOMP_PERM, &bitmask)) > > > > > > > + return 0; > > > > > > > + > > > > > > > + return (bitmask & XFEATURE_MASK_XTILE) != 0; } > > > > > > > + > > > > > > > /* Initialize tile config by setting all tmm size to 16x64 > > > > > > > */ void init_tile_config (__tilecfg_u *dst) { @@ -186,6 > > > > > > > +209,7 @@ main () #ifdef AMX_BF16 > > > > > > > && __builtin_cpu_supports ("amx-bf16") #endif > > > > > > > + && request_perm_xtile_data () > > > > > > > ) > > > > > > > { > > > > > > > DO_TEST (); > > > > > > > -- > > > > > > > 2.18.2 > > > > > > >
diff --git a/gcc/testsuite/gcc.target/i386/amx-check.h b/gcc/testsuite/gcc.target/i386/amx-check.h index 434b0e59703..92ed8669304 100644 --- a/gcc/testsuite/gcc.target/i386/amx-check.h +++ b/gcc/testsuite/gcc.target/i386/amx-check.h @@ -4,11 +4,22 @@ #include <stdlib.h> #include <string.h> #include <stdint.h> +#include <unistd.h> +#include <sys/syscall.h> #ifdef DEBUG #include <stdio.h> #endif #include "cpuid.h" +#define XFEATURE_XTILECFG 17 +#define XFEATURE_XTILEDATA 18 +#define XFEATURE_MASK_XTILECFG (1 << XFEATURE_XTILECFG) +#define XFEATURE_MASK_XTILEDATA (1 << XFEATURE_XTILEDATA) +#define XFEATURE_MASK_XTILE (XFEATURE_MASK_XTILECFG | XFEATURE_MASK_XTILEDATA) + +#define ARCH_GET_XCOMP_PERM 0x1022 +#define ARCH_REQ_XCOMP_PERM 0x1023 + /* TODO: The tmm emulation is temporary for current AMX implementation with no tmm regclass, should be changed in the future. */ @@ -44,6 +55,18 @@ typedef struct __tile /* Stride (colum width in byte) used for tileload/store */ #define _STRIDE 64 +/* We need syscall to use amx functions */ +int request_perm_xtile_data() +{ + unsigned long bitmask; + + if (syscall (SYS_arch_prctl, ARCH_REQ_XCOMP_PERM, XFEATURE_XTILEDATA) || + syscall (SYS_arch_prctl, ARCH_GET_XCOMP_PERM, &bitmask)) + return 0; + + return (bitmask & XFEATURE_MASK_XTILE) != 0; +} + /* Initialize tile config by setting all tmm size to 16x64 */ void init_tile_config (__tilecfg_u *dst) { @@ -186,6 +209,7 @@ main () #ifdef AMX_BF16 && __builtin_cpu_supports ("amx-bf16") #endif + && request_perm_xtile_data () ) { DO_TEST ();