Skip to content

Commit 046da3b

Browse files
hanhanWkeshavvinayak01
authored andcommitted
Carrying revert: - llvm/llvm-project@b6a98b9: It is not clear if we should only capture the conversion failure once or not. Asking a question here: llvm/llvm-project#150982 (comment) The version numbers are bumped because of iree-org/llvm-project@c2c8644. The comment is dropped because don't have any recent mobile devices to test with today. --------- Signed-off-by: hanhanW <[email protected]> Signed-off-by: keshavvinayak01 <[email protected]>
1 parent fccf8cc commit 046da3b

File tree

3 files changed

+4
-9
lines changed

3 files changed

+4
-9
lines changed

compiler/src/iree/compiler/Codegen/Dialect/GPU/TargetUtils/KnownTargets.cpp

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -921,11 +921,6 @@ TargetAttr getVulkanTargetDetails(llvm::StringRef target,
921921
// duplicated product or microarchitecture names among vendors, which should
922922
// be the case.
923923

924-
// For mobile GPUs we target Vulkan 1.1, which accepts SPIR-V 1.3 as the
925-
// maximum. But the VK_KHR_spirv_1_4 extension is commonly available so we use
926-
// SPIR-V 1.4. For non-mobile GPUs we target Vulkan 1.3, which accepts
927-
// SPIR-V 1.6 as the maximum.
928-
929924
// TODO: Add feature bits for physical storage buffer.
930925

931926
if (std::optional<TargetDetails> details = getAMDGPUTargetDetails(target)) {
@@ -934,7 +929,7 @@ TargetAttr getVulkanTargetDetails(llvm::StringRef target,
934929
}
935930
if (std::optional<TargetDetails> details = getARMGPUTargetDetails(target)) {
936931
return createTargetAttr(*details, normalizeARMGPUTarget(target),
937-
/*features=*/"spirv:v1.4,cap:Shader", context);
932+
/*features=*/"spirv:v1.6,cap:Shader", context);
938933
}
939934
if (std::optional<TargetDetails> details =
940935
getNVIDIAGPUTargetDetails(target)) {
@@ -944,7 +939,7 @@ TargetAttr getVulkanTargetDetails(llvm::StringRef target,
944939
if (std::optional<TargetDetails> details =
945940
getQualcommGPUTargetDetails(target)) {
946941
return createTargetAttr(*details, target,
947-
/*features=*/"spirv:v1.4,cap:Shader", context);
942+
/*features=*/"spirv:v1.6,cap:Shader", context);
948943
}
949944

950945
// Go through common profiles if not hit in the above.

compiler/src/iree/compiler/Codegen/LLVMGPU/test/reduction_pipeline_cuda.mlir

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ hal.executable.variant @cuda target(<"cuda", "cuda-nvptx-fb">) {
114114
// CHECK: gpu.subgroup_reduce
115115
// CHECK: vector.transfer_write {{.*}} : vector<1xf32
116116
// CHECK: gpu.subgroup_reduce
117-
// CHECK: arith.divf {{.*}} : vector<1x1x4xf32>
117+
// CHECK: arith.divf {{.*}} : vector<f32>
118118
// CHECK: vector.transfer_write {{.*}} : vector<4xf32>, {{.*}}
119119
// CHECK: return
120120

third_party/llvm-project

Submodule llvm-project updated 710 files

0 commit comments

Comments
 (0)