llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT--> @llvm/pr-subscribers-clang Author: Farzon Lotfi (farzonl) <details> <summary>Changes</summary> - `CGBuiltin.cpp` - Switch to using `CGM.getHLSLRuntime().get##NAME##Intrinsic()` - `CGHLSLRuntime.h` - Add any to backend intrinsic abstraction - `IntrinsicsSPIRV.td` - Add any intrinsic to SPIR-V. - `SPIRVInstructionSelector.cpp` - Add means of selecting any intrinsic. Any and All share the same behavior up to the opCode. They are only different in vector cases. Completes #<!-- -->88045 --- Patch is 30.77 KiB, truncated to 20.00 KiB below, full version: https://github.com/llvm/llvm-project/pull/88325.diff 6 Files Affected: - (modified) clang/lib/CodeGen/CGBuiltin.cpp (+2-1) - (modified) clang/lib/CodeGen/CGHLSLRuntime.h (+1) - (modified) clang/test/CodeGenHLSL/builtins/any.hlsl (+244-126) - (modified) llvm/include/llvm/IR/IntrinsicsSPIRV.td (+1) - (modified) llvm/lib/Target/SPIRV/SPIRVInstructionSelector.cpp (+25-4) - (added) llvm/test/CodeGen/SPIRV/hlsl-intrinsics/any.ll (+187) ``````````diff diff --git a/clang/lib/CodeGen/CGBuiltin.cpp b/clang/lib/CodeGen/CGBuiltin.cpp index c052367d287820..5914862e93c0bb 100644 --- a/clang/lib/CodeGen/CGBuiltin.cpp +++ b/clang/lib/CodeGen/CGBuiltin.cpp @@ -18194,7 +18194,8 @@ Value *CodeGenFunction::EmitHLSLBuiltinExpr(unsigned BuiltinID, Value *Op0 = EmitScalarExpr(E->getArg(0)); return Builder.CreateIntrinsic( /*ReturnType=*/llvm::Type::getInt1Ty(getLLVMContext()), - Intrinsic::dx_any, ArrayRef<Value *>{Op0}, nullptr, "dx.any"); + CGM.getHLSLRuntime().getAnyIntrinsic(), ArrayRef<Value *>{Op0}, nullptr, + "hlsl.any"); } case Builtin::BI__builtin_hlsl_elementwise_clamp: { Value *OpX = EmitScalarExpr(E->getArg(0)); diff --git a/clang/lib/CodeGen/CGHLSLRuntime.h b/clang/lib/CodeGen/CGHLSLRuntime.h index 2b8073aef973f8..506b364f5b2ec7 100644 --- a/clang/lib/CodeGen/CGHLSLRuntime.h +++ b/clang/lib/CodeGen/CGHLSLRuntime.h @@ -73,6 +73,7 @@ class CGHLSLRuntime { //===----------------------------------------------------------------------===// GENERATE_HLSL_INTRINSIC_FUNCTION(All, all) + GENERATE_HLSL_INTRINSIC_FUNCTION(Any, any) GENERATE_HLSL_INTRINSIC_FUNCTION(ThreadId, thread_id) //===----------------------------------------------------------------------===// diff --git a/clang/test/CodeGenHLSL/builtins/any.hlsl b/clang/test/CodeGenHLSL/builtins/any.hlsl index ae348fec756b3e..84584281a3b7d2 100644 --- a/clang/test/CodeGenHLSL/builtins/any.hlsl +++ b/clang/test/CodeGenHLSL/builtins/any.hlsl @@ -1,186 +1,304 @@ // RUN: %clang_cc1 -finclude-default-header -x hlsl -triple \ +// RUN: spirv-unknown-vulkan-compute %s -fnative-half-type \ +// RUN: -emit-llvm -disable-llvm-passes -o - | FileCheck %s \ +// RUN: --check-prefixes=CHECK,NATIVE_HALF,SPIR_NATIVE_HALF,SPIR_CHECK +// RUN: %clang_cc1 -finclude-default-header -x hlsl -triple \ +// RUN: spirv-unknown-vulkan-compute %s -emit-llvm -disable-llvm-passes \ +// RUN: -o - | FileCheck %s --check-prefixes=CHECK,SPIR_NO_HALF,SPIR_CHECK +// RUN: %clang_cc1 -finclude-default-header -x hlsl -triple \ // RUN: dxil-pc-shadermodel6.3-library %s -fnative-half-type \ // RUN: -emit-llvm -disable-llvm-passes -o - | FileCheck %s \ -// RUN: --check-prefixes=CHECK,NATIVE_HALF +// RUN: --check-prefixes=CHECK,NATIVE_HALF,DXIL_NATIVE_HALF,DXIL_CHECK // RUN: %clang_cc1 -finclude-default-header -x hlsl -triple \ // RUN: dxil-pc-shadermodel6.3-library %s -emit-llvm -disable-llvm-passes \ -// RUN: -o - | FileCheck %s --check-prefixes=CHECK,NO_HALF +// RUN: -o - | FileCheck %s --check-prefixes=CHECK,DXIL_NO_HALF,DXIL_CHECK #ifdef __HLSL_ENABLE_16_BIT -// NATIVE_HALF: define noundef i1 @ -// NATIVE_HALF: %dx.any = call i1 @llvm.dx.any.i16 -// NATIVE_HALF: ret i1 %dx.any +// DXIL_NATIVE_HALF: define noundef i1 @ +// SPIR_NATIVE_HALF: define spir_func noundef i1 @ +// DXIL_NATIVE_HALF: %hlsl.any = call i1 @llvm.dx.any.i16 +// SPIR_NATIVE_HALF: %hlsl.any = call i1 @llvm.spv.any.i16 +// NATIVE_HALF: ret i1 %hlsl.any bool test_any_int16_t(int16_t p0) { return any(p0); } -// NATIVE_HALF: define noundef i1 @ -// NATIVE_HALF: %dx.any = call i1 @llvm.dx.any.v2i16 -// NATIVE_HALF: ret i1 %dx.any + +// DXIL_NATIVE_HALF: define noundef i1 @ +// SPIR_NATIVE_HALF: define spir_func noundef i1 @ +// DXIL_NATIVE_HALF: %hlsl.any = call i1 @llvm.dx.any.v2i16 +// SPIR_NATIVE_HALF: %hlsl.any = call i1 @llvm.spv.any.v2i16 +// NATIVE_HALF: ret i1 %hlsl.any bool test_any_int16_t2(int16_t2 p0) { return any(p0); } -// NATIVE_HALF: define noundef i1 @ -// NATIVE_HALF: %dx.any = call i1 @llvm.dx.any.v3i16 -// NATIVE_HALF: ret i1 %dx.any + +// DXIL_NATIVE_HALF: define noundef i1 @ +// SPIR_NATIVE_HALF: define spir_func noundef i1 @ +// DXIL_NATIVE_HALF: %hlsl.any = call i1 @llvm.dx.any.v3i16 +// SPIR_NATIVE_HALF: %hlsl.any = call i1 @llvm.spv.any.v3i16 +// NATIVE_HALF: ret i1 %hlsl.any bool test_any_int16_t3(int16_t3 p0) { return any(p0); } -// NATIVE_HALF: define noundef i1 @ -// NATIVE_HALF: %dx.any = call i1 @llvm.dx.any.v4i16 -// NATIVE_HALF: ret i1 %dx.any + +// DXIL_NATIVE_HALF: define noundef i1 @ +// SPIR_NATIVE_HALF: define spir_func noundef i1 @ +// DXIL_NATIVE_HALF: %hlsl.any = call i1 @llvm.dx.any.v4i16 +// SPIR_NATIVE_HALF: %hlsl.any = call i1 @llvm.spv.any.v4i16 +// NATIVE_HALF: ret i1 %hlsl.any bool test_any_int16_t4(int16_t4 p0) { return any(p0); } -// NATIVE_HALF: define noundef i1 @ -// NATIVE_HALF: %dx.any = call i1 @llvm.dx.any.i16 -// NATIVE_HALF: ret i1 %dx.any +// DXIL_NATIVE_HALF: define noundef i1 @ +// SPIR_NATIVE_HALF: define spir_func noundef i1 @ +// DXIL_NATIVE_HALF: %hlsl.any = call i1 @llvm.dx.any.i16 +// SPIR_NATIVE_HALF: %hlsl.any = call i1 @llvm.spv.any.i16 +// NATIVE_HALF: ret i1 %hlsl.any bool test_any_uint16_t(uint16_t p0) { return any(p0); } -// NATIVE_HALF: define noundef i1 @ -// NATIVE_HALF: %dx.any = call i1 @llvm.dx.any.v2i16 -// NATIVE_HALF: ret i1 %dx.any + +// DXIL_NATIVE_HALF: define noundef i1 @ +// SPIR_NATIVE_HALF: define spir_func noundef i1 @ +// DXIL_NATIVE_HALF: %hlsl.any = call i1 @llvm.dx.any.v2i16 +// SPIR_NATIVE_HALF: %hlsl.any = call i1 @llvm.spv.any.v2i16 +// NATIVE_HALF: ret i1 %hlsl.any bool test_any_uint16_t2(uint16_t2 p0) { return any(p0); } -// NATIVE_HALF: define noundef i1 @ -// NATIVE_HALF: %dx.any = call i1 @llvm.dx.any.v3i16 -// NATIVE_HALF: ret i1 %dx.any + +// DXIL_NATIVE_HALF: define noundef i1 @ +// SPIR_NATIVE_HALF: define spir_func noundef i1 @ +// DXIL_NATIVE_HALF: %hlsl.any = call i1 @llvm.dx.any.v3i16 +// SPIR_NATIVE_HALF: %hlsl.any = call i1 @llvm.spv.any.v3i16 +// NATIVE_HALF: ret i1 %hlsl.any bool test_any_uint16_t3(uint16_t3 p0) { return any(p0); } -// NATIVE_HALF: define noundef i1 @ -// NATIVE_HALF: %dx.any = call i1 @llvm.dx.any.v4i16 -// NATIVE_HALF: ret i1 %dx.any + +// DXIL_NATIVE_HALF: define noundef i1 @ +// SPIR_NATIVE_HALF: define spir_func noundef i1 @ +// DXIL_NATIVE_HALF: %hlsl.any = call i1 @llvm.dx.any.v4i16 +// SPIR_NATIVE_HALF: %hlsl.any = call i1 @llvm.spv.any.v4i16 +// NATIVE_HALF: ret i1 %hlsl.any bool test_any_uint16_t4(uint16_t4 p0) { return any(p0); } #endif // __HLSL_ENABLE_16_BIT -// CHECK: define noundef i1 @ -// NATIVE_HALF: %dx.any = call i1 @llvm.dx.any.f16 -// NO_HALF: %dx.any = call i1 @llvm.dx.any.f32 -// CHECK: ret i1 %dx.any +// DXIL_CHECK: define noundef i1 @ +// SPIR_CHECK: define spir_func noundef i1 @ +// DXIL_NATIVE_HALF: %hlsl.any = call i1 @llvm.dx.any.f16 +// SPIR_NATIVE_HALF: %hlsl.any = call i1 @llvm.spv.any.f16 +// DXIL_NO_HALF: %hlsl.any = call i1 @llvm.dx.any.f32 +// SPIR_NO_HALF: %hlsl.any = call i1 @llvm.spv.any.f32 +// CHECK: ret i1 %hlsl.any bool test_any_half(half p0) { return any(p0); } -// CHECK: define noundef i1 @ -// NATIVE_HALF: %dx.any = call i1 @llvm.dx.any.v2f16 -// NO_HALF: %dx.any = call i1 @llvm.dx.any.v2f32 -// CHECK: ret i1 %dx.any +// DXIL_CHECK: define noundef i1 @ +// SPIR_CHECK: define spir_func noundef i1 @ +// DXIL_NATIVE_HALF: %hlsl.any = call i1 @llvm.dx.any.v2f16 +// SPIR_NATIVE_HALF: %hlsl.any = call i1 @llvm.spv.any.v2f16 +// DXIL_NO_HALF: %hlsl.any = call i1 @llvm.dx.any.v2f32 +// SPIR_NO_HALF: %hlsl.any = call i1 @llvm.spv.any.v2f32 +// CHECK: ret i1 %hlsl.any bool test_any_half2(half2 p0) { return any(p0); } -// CHECK: define noundef i1 @ -// NATIVE_HALF: %dx.any = call i1 @llvm.dx.any.v3f16 -// NO_HALF: %dx.any = call i1 @llvm.dx.any.v3f32 -// CHECK: ret i1 %dx.any +// DXIL_CHECK: define noundef i1 @ +// SPIR_CHECK: define spir_func noundef i1 @ +// DXIL_NATIVE_HALF: %hlsl.any = call i1 @llvm.dx.any.v3f16 +// SPIR_NATIVE_HALF: %hlsl.any = call i1 @llvm.spv.any.v3f16 +// DXIL_NO_HALF: %hlsl.any = call i1 @llvm.dx.any.v3f32 +// SPIR_NO_HALF: %hlsl.any = call i1 @llvm.spv.any.v3f32 +// CHECK: ret i1 %hlsl.any bool test_any_half3(half3 p0) { return any(p0); } -// CHECK: define noundef i1 @ -// NATIVE_HALF: %dx.any = call i1 @llvm.dx.any.v4f16 -// NO_HALF: %dx.any = call i1 @llvm.dx.any.v4f32 -// CHECK: ret i1 %dx.any +// DXIL_CHECK: define noundef i1 @ +// SPIR_CHECK: define spir_func noundef i1 @ +// DXIL_NATIVE_HALF: %hlsl.any = call i1 @llvm.dx.any.v4f16 +// SPIR_NATIVE_HALF: %hlsl.any = call i1 @llvm.spv.any.v4f16 +// DXIL_NO_HALF: %hlsl.any = call i1 @llvm.dx.any.v4f32 +// SPIR_NO_HALF: %hlsl.any = call i1 @llvm.spv.any.v4f32 +// CHECK: ret i1 %hlsl.any bool test_any_half4(half4 p0) { return any(p0); } -// CHECK: define noundef i1 @ -// CHECK: %dx.any = call i1 @llvm.dx.any.f32 -// CHECK: ret i1 %dx.any +// DXIL_CHECK: define noundef i1 @ +// SPIR_CHECK: define spir_func noundef i1 @ +// DXIL_CHECK: %hlsl.any = call i1 @llvm.dx.any.f32 +// SPIR_CHECK: %hlsl.any = call i1 @llvm.spv.any.f32 +// CHECK: ret i1 %hlsl.any bool test_any_float(float p0) { return any(p0); } -// CHECK: define noundef i1 @ -// CHECK: %dx.any = call i1 @llvm.dx.any.v2f32 -// CHECK: ret i1 %dx.any + +// DXIL_CHECK: define noundef i1 @ +// SPIR_CHECK: define spir_func noundef i1 @ +// DXIL_CHECK: %hlsl.any = call i1 @llvm.dx.any.v2f32 +// SPIR_CHECK: %hlsl.any = call i1 @llvm.spv.any.v2f32 +// CHECK: ret i1 %hlsl.any bool test_any_float2(float2 p0) { return any(p0); } -// CHECK: define noundef i1 @ -// CHECK: %dx.any = call i1 @llvm.dx.any.v3f32 -// CHECK: ret i1 %dx.any + +// DXIL_CHECK: define noundef i1 @ +// SPIR_CHECK: define spir_func noundef i1 @ +// DXIL_CHECK: %hlsl.any = call i1 @llvm.dx.any.v3f32 +// SPIR_CHECK: %hlsl.any = call i1 @llvm.spv.any.v3f32 +// CHECK: ret i1 %hlsl.any bool test_any_float3(float3 p0) { return any(p0); } -// CHECK: define noundef i1 @ -// CHECK: %dx.any = call i1 @llvm.dx.any.v4f32 -// CHECK: ret i1 %dx.any + +// DXIL_CHECK: define noundef i1 @ +// SPIR_CHECK: define spir_func noundef i1 @ +// DXIL_CHECK: %hlsl.any = call i1 @llvm.dx.any.v4f32 +// SPIR_CHECK: %hlsl.any = call i1 @llvm.spv.any.v4f32 +// CHECK: ret i1 %hlsl.any bool test_any_float4(float4 p0) { return any(p0); } -// CHECK: define noundef i1 @ -// CHECK: %dx.any = call i1 @llvm.dx.any.f64 -// CHECK: ret i1 %dx.any +// DXIL_CHECK: define noundef i1 @ +// SPIR_CHECK: define spir_func noundef i1 @ +// DXIL_CHECK: %hlsl.any = call i1 @llvm.dx.any.f64 +// SPIR_CHECK: %hlsl.any = call i1 @llvm.spv.any.f64 +// CHECK: ret i1 %hlsl.any bool test_any_double(double p0) { return any(p0); } -// CHECK: define noundef i1 @ -// CHECK: %dx.any = call i1 @llvm.dx.any.v2f64 -// CHECK: ret i1 %dx.any + +// DXIL_CHECK: define noundef i1 @ +// SPIR_CHECK: define spir_func noundef i1 @ +// DXIL_CHECK: %hlsl.any = call i1 @llvm.dx.any.v2f64 +// SPIR_CHECK: %hlsl.any = call i1 @llvm.spv.any.v2f64 +// CHECK: ret i1 %hlsl.any bool test_any_double2(double2 p0) { return any(p0); } -// CHECK: define noundef i1 @ -// CHECK: %dx.any = call i1 @llvm.dx.any.v3f64 -// CHECK: ret i1 %dx.any + +// DXIL_CHECK: define noundef i1 @ +// SPIR_CHECK: define spir_func noundef i1 @ +// DXIL_CHECK: %hlsl.any = call i1 @llvm.dx.any.v3f64 +// SPIR_CHECK: %hlsl.any = call i1 @llvm.spv.any.v3f64 +// CHECK: ret i1 %hlsl.any bool test_any_double3(double3 p0) { return any(p0); } -// CHECK: define noundef i1 @ -// CHECK: %dx.any = call i1 @llvm.dx.any.v4f64 -// CHECK: ret i1 %dx.any + +// DXIL_CHECK: define noundef i1 @ +// SPIR_CHECK: define spir_func noundef i1 @ +// DXIL_CHECK: %hlsl.any = call i1 @llvm.dx.any.v4f64 +// SPIR_CHECK: %hlsl.any = call i1 @llvm.spv.any.v4f64 +// CHECK: ret i1 %hlsl.any bool test_any_double4(double4 p0) { return any(p0); } -// CHECK: define noundef i1 @ -// CHECK: %dx.any = call i1 @llvm.dx.any.i32 -// CHECK: ret i1 %dx.any +// DXIL_CHECK: define noundef i1 @ +// SPIR_CHECK: define spir_func noundef i1 @ +// DXIL_CHECK: %hlsl.any = call i1 @llvm.dx.any.i32 +// SPIR_CHECK: %hlsl.any = call i1 @llvm.spv.any.i32 +// CHECK: ret i1 %hlsl.any bool test_any_int(int p0) { return any(p0); } -// CHECK: define noundef i1 @ -// CHECK: %dx.any = call i1 @llvm.dx.any.v2i32 -// CHECK: ret i1 %dx.any + +// DXIL_CHECK: define noundef i1 @ +// SPIR_CHECK: define spir_func noundef i1 @ +// DXIL_CHECK: %hlsl.any = call i1 @llvm.dx.any.v2i32 +// SPIR_CHECK: %hlsl.any = call i1 @llvm.spv.any.v2i32 +// CHECK: ret i1 %hlsl.any bool test_any_int2(int2 p0) { return any(p0); } -// CHECK: define noundef i1 @ -// CHECK: %dx.any = call i1 @llvm.dx.any.v3i32 -// CHECK: ret i1 %dx.any + +// DXIL_CHECK: define noundef i1 @ +// SPIR_CHECK: define spir_func noundef i1 @ +// DXIL_CHECK: %hlsl.any = call i1 @llvm.dx.any.v3i32 +// SPIR_CHECK: %hlsl.any = call i1 @llvm.spv.any.v3i32 +// CHECK: ret i1 %hlsl.any bool test_any_int3(int3 p0) { return any(p0); } -// CHECK: define noundef i1 @ -// CHECK: %dx.any = call i1 @llvm.dx.any.v4i32 -// CHECK: ret i1 %dx.any + +// DXIL_CHECK: define noundef i1 @ +// SPIR_CHECK: define spir_func noundef i1 @ +// DXIL_CHECK: %hlsl.any = call i1 @llvm.dx.any.v4i32 +// SPIR_CHECK: %hlsl.any = call i1 @llvm.spv.any.v4i32 +// CHECK: ret i1 %hlsl.any bool test_any_int4(int4 p0) { return any(p0); } -// CHECK: define noundef i1 @ -// CHECK: %dx.any = call i1 @llvm.dx.any.i32 -// CHECK: ret i1 %dx.any +// DXIL_CHECK: define noundef i1 @ +// SPIR_CHECK: define spir_func noundef i1 @ +// DXIL_CHECK: %hlsl.any = call i1 @llvm.dx.any.i32 +// SPIR_CHECK: %hlsl.any = call i1 @llvm.spv.any.i32 +// CHECK: ret i1 %hlsl.any bool test_any_uint(uint p0) { return any(p0); } -// CHECK: define noundef i1 @ -// CHECK: %dx.any = call i1 @llvm.dx.any.v2i32 -// CHECK: ret i1 %dx.any + +// DXIL_CHECK: define noundef i1 @ +// SPIR_CHECK: define spir_func noundef i1 @ +// DXIL_CHECK: %hlsl.any = call i1 @llvm.dx.any.v2i32 +// SPIR_CHECK: %hlsl.any = call i1 @llvm.spv.any.v2i32 +// CHECK: ret i1 %hlsl.any bool test_any_uint2(uint2 p0) { return any(p0); } -// CHECK: define noundef i1 @ -// CHECK: %dx.any = call i1 @llvm.dx.any.v3i32 -// CHECK: ret i1 %dx.any + +// DXIL_CHECK: define noundef i1 @ +// SPIR_CHECK: define spir_func noundef i1 @ +// DXIL_CHECK: %hlsl.any = call i1 @llvm.dx.any.v3i32 +// SPIR_CHECK: %hlsl.any = call i1 @llvm.spv.any.v3i32 +// CHECK: ret i1 %hlsl.any bool test_any_uint3(uint3 p0) { return any(p0); } -// CHECK: define noundef i1 @ -// CHECK: %dx.any = call i1 @llvm.dx.any.v4i32 -// CHECK: ret i1 %dx.any + +// DXIL_CHECK: define noundef i1 @ +// SPIR_CHECK: define spir_func noundef i1 @ +// DXIL_CHECK: %hlsl.any = call i1 @llvm.dx.any.v4i32 +// SPIR_CHECK: %hlsl.any = call i1 @llvm.spv.any.v4i32 +// CHECK: ret i1 %hlsl.any bool test_any_uint4(uint4 p0) { return any(p0); } -// CHECK: define noundef i1 @ -// CHECK: %dx.any = call i1 @llvm.dx.any.i64 -// CHECK: ret i1 %dx.any +// DXIL_CHECK: define noundef i1 @ +// SPIR_CHECK: define spir_func noundef i1 @ +// DXIL_CHECK: %hlsl.any = call i1 @llvm.dx.any.i64 +// SPIR_CHECK: %hlsl.any = call i1 @llvm.spv.any.i64 +// CHECK: ret i1 %hlsl.any bool test_any_int64_t(int64_t p0) { return any(p0); } -// CHECK: define noundef i1 @ -// CHECK: %dx.any = call i1 @llvm.dx.any.v2i64 -// CHECK: ret i1 %dx.any + +// DXIL_CHECK: define noundef i1 @ +// SPIR_CHECK: define spir_func noundef i1 @ +// DXIL_CHECK: %hlsl.any = call i1 @llvm.dx.any.v2i64 +// SPIR_CHECK: %hlsl.any = call i1 @llvm.spv.any.v2i64 +// CHECK: ret i1 %hlsl.any bool test_any_int64_t2(int64_t2 p0) { return any(p0); } -// CHECK: define noundef i1 @ -// CHECK: %dx.any = call i1 @llvm.dx.any.v3i64 -// CHECK: ret i1 %dx.any + +// DXIL_CHECK: define noundef i1 @ +// SPIR_CHECK: define spir_func noundef i1 @ +// DXIL_CHECK: %hlsl.any = call i1 @llvm.dx.any.v3i64 +// SPIR_CHECK: %hlsl.any = call i1 @llvm.spv.any.v3i64 +// CHECK: ret i1 %hlsl.any bool test_any_int64_t3(int64_t3 p0) { return any(p0); } -// CHECK: define noundef i1 @ -// CHECK: %dx.any = call i1 @llvm.dx.any.v4i64 -// CHECK: ret i1 %dx.any + +// DXIL_CHECK: define noundef i1 @ +// SPIR_CHECK: define spir_func noundef i1 @ +// DXIL_CHECK: %hlsl.any = call i1 @llvm.dx.any.v4i64 +// SPIR_CHECK: %hlsl.any = call i1 @llvm.spv.any.v4i64 +// CHECK: ret i1 %hlsl.any bool test_any_int64_t4(int64_t4 p0) { return any(p0); } -// CHECK: define noundef i1 @ -// CHECK: %dx.any = call i1 @llvm.dx.any.i64 -// CHECK: ret i1 %dx.any +// DXIL_CHECK: define noundef i1 @ +// SPIR_CHECK: define spir_func noundef i1 @ +// DXIL_CHECK: %hlsl.any = call i1 @llvm.dx.any.i64 +// SPIR_CHECK: %hlsl.any = call i1 @llvm.spv.any.i64 +// CHECK: ret i1 %hlsl.any bool test_any_uint64_t(uint64_t p0) { return any(p0); } -// CHECK: define noundef i1 @ -// CHECK: %dx.any = call i1 @llvm.dx.any.v2i64 -// CHECK: ret i1 %dx.any + +// DXIL_CHECK: define noundef i1 @ +// SPIR_CHECK: define spir_func noundef i1 @ +// DXIL_CHECK: %hlsl.any = call i1 @llvm.dx.any.v2i64 +// SPIR_CHECK: %hlsl.any = call i1 @llvm.spv.any.v2i64 +// CHECK: ret i1 %hlsl.any bool test_any_uint64_t2(uint64_t2 p0) { return any(p0); } -// CHECK: define noundef i1 @ -// CHECK: %dx.any = call i1 @llvm.dx.any.v3i64 -// CHECK: ret i1 %dx.any + +// DXIL_CHECK: define noundef i1 @ +// SPIR_CHECK: define spir_func noundef i1 @ +// DXIL_CHECK: %hlsl.any = call i1 @llvm.dx.any.v3i64 +// SPIR_CHECK: %hlsl.any = call i1 @llvm.spv.any.v3i64 +// CHECK: ret i1 %hlsl.any bool test_any_uint64_t3(uint64_t3 p0) { return any(p0); } -// CHECK: define noundef i1 @ -// CHECK: %dx.any = call i1 @llvm.dx.any.v4i64 -// CHECK: ret i1 %dx.any + +// DXIL_CHECK: define noundef i1 @ +// SPIR_CHECK: define spir_func noundef i1 @ +// DXIL_CHECK: %hlsl.any = call i1 @llvm.dx.any.v4i64 +// SPIR_CHECK: %hlsl.any = call i1 @llvm.spv.any.v4i64 +// CHECK: ret i1 %hlsl.any bool test_any_uint64_t4(uint64_t4 p0) { return any(p0); } -// CHECK: define noundef i1 @ -// CHECK: %dx.any = call i1 @llvm.dx.any.i1 -// CHECK: ret i1 %dx.any +// DXIL_CHECK: define noundef i1 @ +// SPIR_CHECK: define spir_func noundef i1 @ +// DXIL_CHECK: %hlsl.any = call i1 @llvm.dx.any.i1 +// SPIR_CHECK: %hlsl.any = call i1 @llvm.spv.any.i1 +// CHECK: ret i1 %hlsl.any bool test_any_bool(bool p0) { return any(p0); } -// CHECK: define noundef i1 @ -// CHECK: %dx.any = call i1 @llvm.dx.any.v2i1 -// CHECK: ret i1 %dx.any + +// DXIL_CHECK: define noundef i1 @ +// SPIR_CHECK: define spir_func noundef i1 @ +// DXIL_CHECK: %hlsl.any = call i1 @llvm.dx.any.v2i1 +// SPIR_CHECK: %hlsl.any = call i1 @llvm.spv.any.v2i1 +// CHECK: ret i1 %hlsl.any bool test_any_bool2(bool2 p0) { return any(p0); } -// CHECK: define noundef i1 @ -// CHECK: %dx.any = call i1 @llvm.dx.any.v3i1 -// CHECK: ret i1 %dx.any + +// DXIL_CHECK: define noundef i1 @ +// SPIR_CHECK: define spir_func noundef i1 @ +// DXIL_CHECK: %hlsl.any = call i1 @llvm.dx.any.v3i1 +// SPIR_CHECK: %hlsl.any = call i1 @llvm.spv.any.v3i1 +// CHECK: ret i1 %hlsl.any bool test_any_bool3(bool3 p0) { return any(p0); } -// CHECK: define noundef i1 @ -// CHECK: %dx.any = call i1 @llvm.dx.any.v4i1 -// CHECK: ret i1 %dx.any + +// DXIL_CHECK: define noundef i1 @ +// SPIR_CHECK: define spir_func noundef i1 @ +// DXIL_CHECK: %hlsl.any = call i1 @llvm.dx.any.v4i1 +// SPIR_CHECK: %hlsl.any = call i1 @llvm.spv.any.v4i1 +// CHECK: ret i1 %hlsl.any bool test_any_bool4(bool4 p0) { return any(p0); } diff --git a/llvm/include/llvm/IR/IntrinsicsSPIRV.td b/llvm/include/llvm/IR/IntrinsicsSPIRV.td index f843383f0b00ed..b6618baceb5608 100644 --- a/llvm/include/llvm/IR/IntrinsicsSPIRV.td +++ b/llvm/include/llvm/IR/IntrinsicsSPIRV.td @@ -57,4 +57,5 @@ let TargetPrefix = "spv" in { def int_spv_create_handle : ClangBuiltin<"__builtin_hlsl_create_handle">, Intrinsic<[ llvm_ptr_ty ], [llvm_i8_ty], [IntrWillReturn]>; def int_spv_all : DefaultAttrsIntrinsic<[llvm_i1_ty], [llvm_any_ty]>; + def int_spv_any : DefaultAttrsIntrinsic<[llvm_i1_ty], [llvm_any_ty]>; } diff --git a/llvm/lib/Target/SPIRV/SPIRVInstructionSelector.cpp b/llvm/lib/Target/SPIRV/SPIRVInstructionSelector.cpp index c1c0fc4b7dd489..200fe38298c021 100644 --- a/llvm/lib/Target/SPIRV/SPIRVInstructionSelector.cpp +++ b/llvm/lib/Target/SPIRV/SPIRVInstructionSelector.cpp @@ -145,9 +145,15 @@ class SPIRVInstructionSelector : public InstructionSelector { bool selectAddrSpaceCast(Register ResVReg, const SPIRVType *ResType, MachineInstr &I) const; + bool selectAnyOrAll(Register ResVReg, const SPIRVType *ResType, + MachineInstr &I, unsigned OpType) const; + bool selectAll(Register ResVReg, const SPIRVType *ResType, MachineInstr &I) const; + bool selectAny(Register ResVReg, const SPIRVType *ResType, + MachineInstr &I) const; + bool selectBitreverse(Register ResVReg, const SPIRVType *ResType, ... [truncated] `````````` </details> https://github.com/llvm/llvm-project/pull/88325 _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits