diff --git a/clang/lib/CodeGen/CGBuiltin.cpp b/clang/lib/CodeGen/CGBuiltin.cpp index c7b219dcfcec5..9f95697f284c4 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{Op0}, nullptr, "dx.any"); + CGM.getHLSLRuntime().getAnyIntrinsic(), ArrayRef{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 2b8073aef973f..506b364f5b2ec 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 ae348fec756b3..84584281a3b7d 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 f843383f0b00e..b6618baceb560 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 c1c0fc4b7dd48..200fe38298c02 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, MachineInstr &I) const; @@ -1160,9 +1166,10 @@ static unsigned getBoolCmpOpcode(unsigned PredNum) { } } -bool SPIRVInstructionSelector::selectAll(Register ResVReg, - const SPIRVType *ResType, - MachineInstr &I) const { +bool SPIRVInstructionSelector::selectAnyOrAll(Register ResVReg, + const SPIRVType *ResType, + MachineInstr &I, + unsigned OpAnyOrAll) const { assert(I.getNumOperands() == 3); assert(I.getOperand(2).isReg()); MachineBasicBlock &BB = *I.getParent(); @@ -1212,13 +1219,25 @@ bool SPIRVInstructionSelector::selectAll(Register ResVReg, if (!IsVectorTy) return true; - return BuildMI(BB, I, I.getDebugLoc(), TII.get(SPIRV::OpAll)) + return BuildMI(BB, I, I.getDebugLoc(), TII.get(OpAnyOrAll)) .addDef(ResVReg) .addUse(GR.getSPIRVTypeID(SpvBoolScalarTy)) .addUse(NotEqualReg) .constrainAllUses(TII, TRI, RBI); } +bool SPIRVInstructionSelector::selectAll(Register ResVReg, + const SPIRVType *ResType, + MachineInstr &I) const { + return selectAnyOrAll(ResVReg, ResType, I, SPIRV::OpAll); +} + +bool SPIRVInstructionSelector::selectAny(Register ResVReg, + const SPIRVType *ResType, + MachineInstr &I) const { + return selectAnyOrAll(ResVReg, ResType, I, SPIRV::OpAny); +} + bool SPIRVInstructionSelector::selectBitreverse(Register ResVReg, const SPIRVType *ResType, MachineInstr &I) const { @@ -1877,6 +1896,8 @@ bool SPIRVInstructionSelector::selectIntrinsic(Register ResVReg, return selectSpvThreadId(ResVReg, ResType, I); case Intrinsic::spv_all: return selectAll(ResVReg, ResType, I); + case Intrinsic::spv_any: + return selectAny(ResVReg, ResType, I); case Intrinsic::spv_lifetime_start: case Intrinsic::spv_lifetime_end: { unsigned Op = IID == Intrinsic::spv_lifetime_start ? SPIRV::OpLifetimeStart diff --git a/llvm/test/CodeGen/SPIRV/hlsl-intrinsics/any.ll b/llvm/test/CodeGen/SPIRV/hlsl-intrinsics/any.ll new file mode 100644 index 0000000000000..b1dd388f5c6e3 --- /dev/null +++ b/llvm/test/CodeGen/SPIRV/hlsl-intrinsics/any.ll @@ -0,0 +1,187 @@ +; RUN: llc -O0 -mtriple=spirv-unknown-unknown %s -o - | FileCheck %s --check-prefixes=CHECK,CHECK-HLSL +; RUN: llc -O0 -mtriple=spirv32-unknown-unknown %s -o - | FileCheck %s --check-prefixes=CHECK,CHECK-OCL +; RUN: %if spirv-tools %{ llc -O0 -mtriple=spirv-unknown-unknown %s -o - -filetype=obj | spirv-val %} +; RUN: %if spirv-tools %{ llc -O0 -mtriple=spirv32-unknown-unknown %s -o - -filetype=obj | spirv-val %} +; Make sure spirv operation function calls for any are generated. + +; CHECK-HLSL-DAG: OpMemoryModel Logical GLSL450 +; CHECK-OCL-DAG: OpMemoryModel Physical32 OpenCL +; CHECK-DAG: OpName %[[#any_bool_arg:]] "a" +; CHECK-DAG: %[[#int_64:]] = OpTypeInt 64 0 +; CHECK-DAG: %[[#bool:]] = OpTypeBool +; CHECK-DAG: %[[#int_32:]] = OpTypeInt 32 0 +; CHECK-DAG: %[[#int_16:]] = OpTypeInt 16 0 +; CHECK-DAG: %[[#float_64:]] = OpTypeFloat 64 +; CHECK-DAG: %[[#float_32:]] = OpTypeFloat 32 +; CHECK-DAG: %[[#float_16:]] = OpTypeFloat 16 +; CHECK-DAG: %[[#vec4_bool:]] = OpTypeVector %[[#bool]] 4 +; CHECK-DAG: %[[#vec4_16:]] = OpTypeVector %[[#int_16]] 4 +; CHECK-DAG: %[[#vec4_32:]] = OpTypeVector %[[#int_32]] 4 +; CHECK-DAG: %[[#vec4_64:]] = OpTypeVector %[[#int_64]] 4 +; CHECK-DAG: %[[#vec4_float_16:]] = OpTypeVector %[[#float_16]] 4 +; CHECK-DAG: %[[#vec4_float_32:]] = OpTypeVector %[[#float_32]] 4 +; CHECK-DAG: %[[#vec4_float_64:]] = OpTypeVector %[[#float_64]] 4 + +; CHECK-HLSL-DAG: %[[#const_i64_0:]] = OpConstant %[[#int_64]] 0 +; CHECK-HLSL-DAG: %[[#const_i32_0:]] = OpConstant %[[#int_32]] 0 +; CHECK-HLSL-DAG: %[[#const_i16_0:]] = OpConstant %[[#int_16]] 0 +; CHECK-HLSL-DAG: %[[#const_f64_0:]] = OpConstant %[[#float_64]] 0 +; CHECK-HLSL-DAG: %[[#const_f32_0:]] = OpConstant %[[#float_32:]] 0 +; CHECK-HLSL-DAG: %[[#const_f16_0:]] = OpConstant %[[#float_16:]] 0 +; CHECK-HLSL-DAG: %[[#vec4_const_zeros_i16:]] = OpConstantComposite %[[#vec4_16:]] %[[#const_i16_0:]] %[[#const_i16_0:]] %[[#const_i16_0:]] %[[#const_i16_0:]] +; CHECK-HLSL-DAG: %[[#vec4_const_zeros_i32:]] = OpConstantComposite %[[#vec4_32:]] %[[#const_i32_0:]] %[[#const_i32_0:]] %[[#const_i32_0:]] %[[#const_i32_0:]] +; CHECK-HLSL-DAG: %[[#vec4_const_zeros_i64:]] = OpConstantComposite %[[#vec4_64:]] %[[#const_i64_0:]] %[[#const_i64_0:]] %[[#const_i64_0:]] %[[#const_i64_0:]] +; CHECK-HLSL-DAG: %[[#vec4_const_zeros_f16:]] = OpConstantComposite %[[#vec4_float_16:]] %[[#const_f16_0:]] %[[#const_f16_0:]] %[[#const_f16_0:]] %[[#const_f16_0:]] +; CHECK-HLSL-DAG: %[[#vec4_const_zeros_f32:]] = OpConstantComposite %[[#vec4_float_32:]] %[[#const_f32_0:]] %[[#const_f32_0:]] %[[#const_f32_0:]] %[[#const_f32_0:]] +; CHECK-HLSL-DAG: %[[#vec4_const_zeros_f64:]] = OpConstantComposite %[[#vec4_float_64:]] %[[#const_f64_0:]] %[[#const_f64_0:]] %[[#const_f64_0:]] %[[#const_f64_0:]] + +; CHECK-OCL-DAG: %[[#const_i64_0:]] = OpConstantNull %[[#int_64]] +; CHECK-OCL-DAG: %[[#const_i32_0:]] = OpConstantNull %[[#int_32]] +; CHECK-OCL-DAG: %[[#const_i16_0:]] = OpConstantNull %[[#int_16]] +; CHECK-OCL-DAG: %[[#const_f64_0:]] = OpConstantNull %[[#float_64]] +; CHECK-OCL-DAG: %[[#const_f32_0:]] = OpConstantNull %[[#float_32:]] +; CHECK-OCL-DAG: %[[#const_f16_0:]] = OpConstantNull %[[#float_16:]] +; CHECK-OCL-DAG: %[[#vec4_const_zeros_i16:]] = OpConstantNull %[[#vec4_16:]] +; CHECK-OCL-DAG: %[[#vec4_const_zeros_i32:]] = OpConstantNull %[[#vec4_32:]] +; CHECK-OCL-DAG: %[[#vec4_const_zeros_i64:]] = OpConstantNull %[[#vec4_64:]] +; CHECK-OCL-DAG: %[[#vec4_const_zeros_f16:]] = OpConstantNull %[[#vec4_float_16:]] +; CHECK-OCL-DAG: %[[#vec4_const_zeros_f32:]] = OpConstantNull %[[#vec4_float_32:]] +; CHECK-OCL-DAG: %[[#vec4_const_zeros_f64:]] = OpConstantNull %[[#vec4_float_64:]] + +define noundef i1 @any_int64_t(i64 noundef %p0) { +entry: + ; CHECK: %[[#arg0:]] = OpFunctionParameter %[[#]] + ; CHECK: %[[#]] = OpINotEqual %[[#bool:]] %[[#arg0:]] %[[#const_i64_0:]] + %hlsl.any = call i1 @llvm.spv.any.i64(i64 %p0) + ret i1 %hlsl.any +} + + +define noundef i1 @any_int(i32 noundef %p0) { +entry: + ; CHECK: %[[#arg0:]] = OpFunctionParameter %[[#]] + ; CHECK: %[[#]] = OpINotEqual %[[#bool:]] %[[#arg0:]] %[[#const_i32_0:]] + %hlsl.any = call i1 @llvm.spv.any.i32(i32 %p0) + ret i1 %hlsl.any +} + + +define noundef i1 @any_int16_t(i16 noundef %p0) { +entry: + ; CHECK: %[[#arg0:]] = OpFunctionParameter %[[#]] + ; CHECK: %[[#]] = OpINotEqual %[[#bool:]] %[[#arg0:]] %[[#const_i16_0:]] + %hlsl.any = call i1 @llvm.spv.any.i16(i16 %p0) + ret i1 %hlsl.any +} + +define noundef i1 @any_double(double noundef %p0) { +entry: + ; CHECK: %[[#arg0:]] = OpFunctionParameter %[[#]] + ; CHECK: %[[#]] = OpFOrdNotEqual %[[#bool:]] %[[#arg0:]] %[[#const_f64_0:]] + %hlsl.any = call i1 @llvm.spv.any.f64(double %p0) + ret i1 %hlsl.any +} + + +define noundef i1 @any_float(float noundef %p0) { +entry: + ; CHECK: %[[#arg0:]] = OpFunctionParameter %[[#]] + ; CHECK: %[[#]] = OpFOrdNotEqual %[[#bool:]] %[[#arg0:]] %[[#const_f32_0:]] + %hlsl.any = call i1 @llvm.spv.any.f32(float %p0) + ret i1 %hlsl.any +} + + +define noundef i1 @any_half(half noundef %p0) { +entry: + ; CHECK: %[[#arg0:]] = OpFunctionParameter %[[#]] + ; CHECK: %[[#]] = OpFOrdNotEqual %[[#bool:]] %[[#arg0:]] %[[#const_f16_0:]] + %hlsl.any = call i1 @llvm.spv.any.f16(half %p0) + ret i1 %hlsl.any +} + + +define noundef i1 @any_bool4(<4 x i1> noundef %p0) { +entry: + ; CHECK: %[[#arg0:]] = OpFunctionParameter %[[#]] + ; CHECK: %[[#]] = OpAny %[[#vec4_bool:]] %[[#arg0:]] + %hlsl.any = call i1 @llvm.spv.any.v4i1(<4 x i1> %p0) + ret i1 %hlsl.any +} + +define noundef i1 @any_short4(<4 x i16> noundef %p0) { +entry: + ; CHECK: %[[#arg0:]] = OpFunctionParameter %[[#]] + ; CHECK: %[[#shortVecNotEq:]] = OpINotEqual %[[#vec4_bool:]] %[[#arg0:]] %[[#vec4_const_zeros_i16:]] + ; CHECK: %[[#]] = OpAny %[[#bool:]] %[[#shortVecNotEq:]] + %hlsl.any = call i1 @llvm.spv.any.v4i16(<4 x i16> %p0) + ret i1 %hlsl.any +} + +define noundef i1 @any_int4(<4 x i32> noundef %p0) { +entry: + ; CHECK: %[[#arg0:]] = OpFunctionParameter %[[#]] + ; CHECK: %[[#i32VecNotEq:]] = OpINotEqual %[[#vec4_bool:]] %[[#arg0:]] %[[#vec4_const_zeros_i32:]] + ; CHECK: %[[#]] = OpAny %[[#bool:]] %[[#i32VecNotEq:]] + %hlsl.any = call i1 @llvm.spv.any.v4i32(<4 x i32> %p0) + ret i1 %hlsl.any +} + +define noundef i1 @any_int64_t4(<4 x i64> noundef %p0) { +entry: + ; CHECK: %[[#arg0:]] = OpFunctionParameter %[[#]] + ; CHECK: %[[#i64VecNotEq:]] = OpINotEqual %[[#vec4_bool:]] %[[#arg0:]] %[[#vec4_const_zeros_i64:]] + ; CHECK: %[[#]] = OpAny %[[#bool:]] %[[#i64VecNotEq]] + %hlsl.any = call i1 @llvm.spv.any.v4i64(<4 x i64> %p0) + ret i1 %hlsl.any +} + +define noundef i1 @any_half4(<4 x half> noundef %p0) { +entry: + ; CHECK: %[[#arg0:]] = OpFunctionParameter %[[#]] + ; CHECK: %[[#f16VecNotEq:]] = OpFOrdNotEqual %[[#vec4_bool:]] %[[#arg0:]] %[[#vec4_const_zeros_f16:]] + ; CHECK: %[[#]] = OpAny %[[#bool]] %[[#f16VecNotEq:]] + %hlsl.any = call i1 @llvm.spv.any.v4f16(<4 x half> %p0) + ret i1 %hlsl.any +} + +define noundef i1 @any_float4(<4 x float> noundef %p0) { +entry: + ; CHECK: %[[#arg0:]] = OpFunctionParameter %[[#]] + ; CHECK: %[[#f32VecNotEq:]] = OpFOrdNotEqual %[[#vec4_bool:]] %[[#arg0:]] %[[#vec4_const_zeros_f32:]] + ; CHECK: %[[#]] = OpAny %[[#bool:]] %[[#f32VecNotEq:]] + %hlsl.any = call i1 @llvm.spv.any.v4f32(<4 x float> %p0) + ret i1 %hlsl.any +} + +define noundef i1 @any_double4(<4 x double> noundef %p0) { +entry: + ; CHECK: %[[#arg0:]] = OpFunctionParameter %[[#]] + ; CHECK: %[[#f64VecNotEq:]] = OpFOrdNotEqual %[[#vec4_bool:]] %[[#arg0:]] %[[#vec4_const_zeros_f64:]] + ; CHECK: %[[#]] = OpAny %[[#bool:]] %[[#f64VecNotEq:]] + %hlsl.any = call i1 @llvm.spv.any.v4f64(<4 x double> %p0) + ret i1 %hlsl.any +} + +define noundef i1 @any_bool(i1 noundef %a) { +entry: + ; CHECK: %[[#any_bool_arg:]] = OpFunctionParameter %[[#bool:]] + ; CHECK: OpReturnValue %[[#any_bool_arg:]] + %hlsl.any = call i1 @llvm.spv.any.i1(i1 %a) + ret i1 %hlsl.any +} + +declare i1 @llvm.spv.any.v4f16(<4 x half>) +declare i1 @llvm.spv.any.v4f32(<4 x float>) +declare i1 @llvm.spv.any.v4f64(<4 x double>) +declare i1 @llvm.spv.any.v4i1(<4 x i1>) +declare i1 @llvm.spv.any.v4i16(<4 x i16>) +declare i1 @llvm.spv.any.v4i32(<4 x i32>) +declare i1 @llvm.spv.any.v4i64(<4 x i64>) +declare i1 @llvm.spv.any.i1(i1) +declare i1 @llvm.spv.any.i16(i16) +declare i1 @llvm.spv.any.i32(i32) +declare i1 @llvm.spv.any.i64(i64) +declare i1 @llvm.spv.any.f16(half) +declare i1 @llvm.spv.any.f32(float) +declare i1 @llvm.spv.any.f64(double)