From a591c7ca0d9fe47223127ee13df60689f36ba112 Mon Sep 17 00:00:00 2001 From: Xiang Li Date: Wed, 29 Jun 2022 14:00:28 -0700 Subject: [PATCH] [HLSL] Change WaveActiveCountBits to wrapper of __builtin_hlsl_wave_active_count_bits Change WaveActiveCountBits from builtin into wrapper of __builtin_hlsl_wave_active_count_bits. For comment at https://reviews.llvm.org/D126857#inline-1235949 Reviewed By: beanz Differential Revision: https://reviews.llvm.org/D128855 --- clang/include/clang/Basic/Builtins.def | 2 +- clang/include/clang/Basic/DiagnosticSemaKinds.td | 2 +- clang/lib/Headers/CMakeLists.txt | 1 + clang/lib/Headers/hlsl.h | 1 + clang/lib/Headers/hlsl/hlsl_intrinsics.h | 15 +++++++++++++++ clang/lib/Sema/SemaDeclAttr.cpp | 3 ++- clang/test/SemaHLSL/Wave.hlsl | 2 +- 7 files changed, 22 insertions(+), 4 deletions(-) create mode 100644 clang/lib/Headers/hlsl/hlsl_intrinsics.h diff --git a/clang/include/clang/Basic/Builtins.def b/clang/include/clang/Basic/Builtins.def index c084cc2..f19807dbb 100644 --- a/clang/include/clang/Basic/Builtins.def +++ b/clang/include/clang/Basic/Builtins.def @@ -1699,7 +1699,7 @@ BUILTIN(__builtin_os_log_format, "v*v*cC*.", "p:0:nt") LANGBUILTIN(__builtin_get_device_side_mangled_name, "cC*.", "ncT", CUDA_LANG) // HLSL -LANGBUILTIN(WaveActiveCountBits, "Uib", "nc", HLSL_LANG) +LANGBUILTIN(__builtin_hlsl_wave_active_count_bits, "Uib", "nc", HLSL_LANG) // Builtins for XRay BUILTIN(__xray_customevent, "vcC*z", "") diff --git a/clang/include/clang/Basic/DiagnosticSemaKinds.td b/clang/include/clang/Basic/DiagnosticSemaKinds.td index dc9ca4b..880fe0d 100644 --- a/clang/include/clang/Basic/DiagnosticSemaKinds.td +++ b/clang/include/clang/Basic/DiagnosticSemaKinds.td @@ -4183,7 +4183,7 @@ def err_attribute_preferred_name_arg_invalid : Error< "argument %0 to 'preferred_name' attribute is not a typedef for " "a specialization of %1">; def err_attribute_builtin_alias : Error< - "%0 attribute can only be applied to a ARM or RISC-V builtin">; + "%0 attribute can only be applied to a ARM, HLSL or RISC-V builtin">; // called-once attribute diagnostics. def err_called_once_attribute_wrong_type : Error< diff --git a/clang/lib/Headers/CMakeLists.txt b/clang/lib/Headers/CMakeLists.txt index dfa3602b..5a0268d 100644 --- a/clang/lib/Headers/CMakeLists.txt +++ b/clang/lib/Headers/CMakeLists.txt @@ -65,6 +65,7 @@ set(hip_files set(hlsl_files hlsl.h hlsl/hlsl_basic_types.h + hlsl/hlsl_intrinsics.h ) set(mips_msa_files diff --git a/clang/lib/Headers/hlsl.h b/clang/lib/Headers/hlsl.h index 0db8a4e..a9dce45 100644 --- a/clang/lib/Headers/hlsl.h +++ b/clang/lib/Headers/hlsl.h @@ -10,5 +10,6 @@ #define _HLSL_H_ #include "hlsl/hlsl_basic_types.h" +#include "hlsl/hlsl_intrinsics.h" #endif //_HLSL_H_ diff --git a/clang/lib/Headers/hlsl/hlsl_intrinsics.h b/clang/lib/Headers/hlsl/hlsl_intrinsics.h new file mode 100644 index 0000000..b5cdb8b --- /dev/null +++ b/clang/lib/Headers/hlsl/hlsl_intrinsics.h @@ -0,0 +1,15 @@ +//===----- hlsl_intrinsics.h - HLSL definitions for intrinsics ----------===// +// +// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. +// See https://llvm.org/LICENSE.txt for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// +//===----------------------------------------------------------------------===// + +#ifndef _HLSL_HLSL_INTRINSICS_H_ +#define _HLSL_HLSL_INTRINSICS_H_ + +__attribute__((clang_builtin_alias(__builtin_hlsl_wave_active_count_bits))) uint +WaveActiveCountBits(bool bBit); + +#endif //_HLSL_HLSL_INTRINSICS_H_ diff --git a/clang/lib/Sema/SemaDeclAttr.cpp b/clang/lib/Sema/SemaDeclAttr.cpp index 52fd5fc..f795239 100644 --- a/clang/lib/Sema/SemaDeclAttr.cpp +++ b/clang/lib/Sema/SemaDeclAttr.cpp @@ -5629,11 +5629,12 @@ static void handleBuiltinAliasAttr(Sema &S, Decl *D, bool IsAArch64 = S.Context.getTargetInfo().getTriple().isAArch64(); bool IsARM = S.Context.getTargetInfo().getTriple().isARM(); bool IsRISCV = S.Context.getTargetInfo().getTriple().isRISCV(); + bool IsHLSL = S.Context.getLangOpts().HLSL; if ((IsAArch64 && !ArmSveAliasValid(S.Context, BuiltinID, AliasName)) || (IsARM && !ArmMveAliasValid(BuiltinID, AliasName) && !ArmCdeAliasValid(BuiltinID, AliasName)) || (IsRISCV && !RISCVAliasValid(BuiltinID, AliasName)) || - (!IsAArch64 && !IsARM && !IsRISCV)) { + (!IsAArch64 && !IsARM && !IsRISCV && !IsHLSL)) { S.Diag(AL.getLoc(), diag::err_attribute_builtin_alias) << AL; return; } diff --git a/clang/test/SemaHLSL/Wave.hlsl b/clang/test/SemaHLSL/Wave.hlsl index ed64d1a..3222a7e 100644 --- a/clang/test/SemaHLSL/Wave.hlsl +++ b/clang/test/SemaHLSL/Wave.hlsl @@ -1,4 +1,4 @@ -// RUN: %clang_cc1 -x hlsl -triple dxil--shadermodel6.7-library %s -verify +// RUN: %clang_cc1 -finclude-default-header -x hlsl -triple dxil--shadermodel6.7-library %s -verify // Make sure WaveActiveCountBits is accepted. -- 2.7.4