[llvm][opt][Transforms][SPIR-V] Enable InferAddressSpaces for SPIR-V
#110897
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -52,6 +52,8 @@ add_llvm_target(SPIRVCodeGen | |
| Core | ||
| Demangle | ||
| GlobalISel | ||
| Passes | ||
| Scalar | ||
| SPIRVAnalysis | ||
| MC | ||
| SPIRVDesc | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -26,9 +26,15 @@ | |
| #include "llvm/CodeGen/TargetLoweringObjectFileImpl.h" | ||
| #include "llvm/CodeGen/TargetPassConfig.h" | ||
| #include "llvm/InitializePasses.h" | ||
| #include "llvm/IR/IntrinsicsAMDGPU.h" | ||
| #include "llvm/IR/PatternMatch.h" | ||
| #include "llvm/MC/TargetRegistry.h" | ||
| #include "llvm/Pass.h" | ||
| #include "llvm/Passes/OptimizationLevel.h" | ||
| #include "llvm/Passes/PassBuilder.h" | ||
| #include "llvm/Target/TargetOptions.h" | ||
| #include "llvm/Transforms/Scalar.h" | ||
| #include "llvm/Transforms/Scalar/InferAddressSpaces.h" | ||
| #include "llvm/Transforms/Utils.h" | ||
| #include <optional> | ||
|
|
||
|
|
@@ -91,6 +97,88 @@ SPIRVTargetMachine::SPIRVTargetMachine(const Target &T, const Triple &TT, | |
| setRequiresStructuredCFG(false); | ||
| } | ||
|
|
||
| enum AddressSpace { | ||
| Function = storageClassToAddressSpace(SPIRV::StorageClass::Function), | ||
| CrossWorkgroup = | ||
| storageClassToAddressSpace(SPIRV::StorageClass::CrossWorkgroup), | ||
| UniformConstant = | ||
| storageClassToAddressSpace(SPIRV::StorageClass::UniformConstant), | ||
| Workgroup = storageClassToAddressSpace(SPIRV::StorageClass::Workgroup), | ||
| Generic = storageClassToAddressSpace(SPIRV::StorageClass::Generic) | ||
| }; | ||
|
|
||
| unsigned SPIRVTargetMachine::getAssumedAddrSpace(const Value *V) const { | ||
| const auto *LD = dyn_cast<LoadInst>(V); | ||
| if (!LD) | ||
| return UINT32_MAX; | ||
|
|
||
| // It must be a load from a pointer to Generic. | ||
| assert(V->getType()->isPointerTy() && | ||
| V->getType()->getPointerAddressSpace() == AddressSpace::Generic); | ||
|
|
||
| const auto *Ptr = LD->getPointerOperand(); | ||
| if (Ptr->getType()->getPointerAddressSpace() != AddressSpace::UniformConstant) | ||
| return UINT32_MAX; | ||
| // For a loaded from a pointer to UniformConstant, we can infer CrossWorkgroup | ||
AlexVlx marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| // storage, as this could only have been legally initialised with a | ||
| // CrossWorkgroup (aka device) constant pointer. | ||
| return AddressSpace::CrossWorkgroup; | ||
| } | ||
|
|
||
| std::pair<const Value *, unsigned> | ||
| SPIRVTargetMachine::getPredicatedAddrSpace(const Value *V) const { | ||
|
||
| using namespace PatternMatch; | ||
|
|
||
| if (auto *II = dyn_cast<IntrinsicInst>(V)) { | ||
| switch (II->getIntrinsicID()) { | ||
| case Intrinsic::amdgcn_is_shared: | ||
| return std::pair(II->getArgOperand(0), AddressSpace::Workgroup); | ||
| case Intrinsic::amdgcn_is_private: | ||
| return std::pair(II->getArgOperand(0), AddressSpace::Function); | ||
| default: | ||
| break; | ||
| } | ||
| return std::pair(nullptr, UINT32_MAX); | ||
| } | ||
| // Check the global pointer predication based on | ||
| // (!is_share(p) && !is_private(p)). Note that logic 'and' is commutative and | ||
| // the order of 'is_shared' and 'is_private' is not significant. | ||
| Value *Ptr; | ||
| if (getTargetTriple().getVendor() == Triple::VendorType::AMD && | ||
| match( | ||
| const_cast<Value *>(V), | ||
| m_c_And(m_Not(m_Intrinsic<Intrinsic::amdgcn_is_shared>(m_Value(Ptr))), | ||
| m_Not(m_Intrinsic<Intrinsic::amdgcn_is_private>( | ||
| m_Deferred(Ptr)))))) | ||
|
||
| return std::pair(Ptr, AddressSpace::CrossWorkgroup); | ||
|
|
||
| return std::pair(nullptr, UINT32_MAX); | ||
| } | ||
|
||
|
|
||
| bool SPIRVTargetMachine::isNoopAddrSpaceCast(unsigned SrcAS, | ||
| unsigned DestAS) const { | ||
| if (SrcAS != AddressSpace::Generic && SrcAS != AddressSpace::CrossWorkgroup) | ||
| return false; | ||
| return DestAS == AddressSpace::Generic || | ||
AlexVlx marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| DestAS == AddressSpace::CrossWorkgroup; | ||
| } | ||
|
Contributor
There was a problem hiding this comment. This is separate, I don't think InferAddressSpaces relies on this
Contributor
Author
There was a problem hiding this comment. It does, please see |
||
|
|
||
| void SPIRVTargetMachine::registerPassBuilderCallbacks(PassBuilder &PB) { | ||
| PB.registerCGSCCOptimizerLateEPCallback( | ||
| [](CGSCCPassManager &PM, OptimizationLevel Level) { | ||
| if (Level == OptimizationLevel::O0) | ||
| return; | ||
|
|
||
| FunctionPassManager FPM; | ||
|
|
||
| // Add infer address spaces pass to the opt pipeline after inlining | ||
| // but before SROA to increase SROA opportunities. | ||
| FPM.addPass(InferAddressSpacesPass(AddressSpace::Generic)); | ||
|
|
||
| PM.addPass(createCGSCCToFunctionPassAdaptor(std::move(FPM))); | ||
| }); | ||
| } | ||
|
|
||
| namespace { | ||
| // SPIR-V Code Generator Pass Configuration Options. | ||
| class SPIRVPassConfig : public TargetPassConfig { | ||
|
|
@@ -178,6 +266,9 @@ void SPIRVPassConfig::addIRPasses() { | |
| addPass(createSPIRVStructurizerPass()); | ||
| } | ||
|
|
||
| if (TM.getOptLevel() > CodeGenOptLevel::None) | ||
| addPass(createInferAddressSpacesPass(AddressSpace::Generic)); | ||
|
Contributor
There was a problem hiding this comment. Not sure why this is a pass parameter to InferAddressSpaces, and a TTI hook
Contributor
Author
There was a problem hiding this comment. Because if one invokes the pass directly via opt there's no way but the TTI query to set Flat/Generic to anything but 0, and because making it explicit at the point of construction rather than relying on that seems somewhat more self documenting.
Contributor
There was a problem hiding this comment. Out of curiosity, why do invoke this pass twice: in the middle-end and code-gen?
Contributor
There was a problem hiding this comment. I remember we had some phase ordering issues where we needed to run this multiple times. I'm not sure what the current status is. We certainly need to run this after inlining |
||
|
|
||
| addPass(createSPIRVRegularizerPass()); | ||
| addPass(createSPIRVPrepareFunctionsPass(TM)); | ||
| addPass(createSPIRVStripConvergenceIntrinsicsPass()); | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| ; RUN: opt -S -mtriple=spirv32-- -passes=infer-address-spaces -o - %s | FileCheck %s | ||
| ; RUN: opt -S -mtriple=spirv64-- -passes=infer-address-spaces -o - %s | FileCheck %s | ||
|
|
||
| @c0 = addrspace(2) global ptr undef | ||
|
|
||
| ; CHECK-LABEL: @generic_ptr_from_constant | ||
| ; CHECK: addrspacecast ptr addrspace(4) %p to ptr addrspace(1) | ||
| ; CHECK-NEXT: load float, ptr addrspace(1) | ||
| define spir_func float @generic_ptr_from_constant() { | ||
| %p = load ptr addrspace(4), ptr addrspace(2) @c0 | ||
| %v = load float, ptr addrspace(4) %p | ||
| ret float %v | ||
| } | ||
|
|
||
| %struct.S = type { ptr addrspace(4), ptr addrspace(4) } | ||
|
|
||
| ; CHECK-LABEL: @generic_ptr_from_aggregate_argument | ||
| ; CHECK: addrspacecast ptr addrspace(4) %p0 to ptr addrspace(1) | ||
| ; CHECK: addrspacecast ptr addrspace(4) %p1 to ptr addrspace(1) | ||
| ; CHECK: load i32, ptr addrspace(1) | ||
| ; CHECK: store float %v1, ptr addrspace(1) | ||
| ; CHECK: ret | ||
| define spir_kernel void @generic_ptr_from_aggregate_argument(ptr addrspace(2) byval(%struct.S) align 8 %0) { | ||
| %p0 = load ptr addrspace(4), ptr addrspace(2) %0 | ||
| %f1 = getelementptr inbounds %struct.S, ptr addrspace(2) %0, i64 0, i32 1 | ||
| %p1 = load ptr addrspace(4), ptr addrspace(2) %f1 | ||
| %v0 = load i32, ptr addrspace(4) %p0 | ||
| %v1 = sitofp i32 %v0 to float | ||
| store float %v1, ptr addrspace(4) %p1 | ||
| ret void | ||
| } |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Move to separate change, not sure this is necessarily valid for spirv
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
UniformConstantis pretty much OCLconstant(with a bit of handwavium around initializers being allowed depending on an undefined client API). This is just saying that if you have a load from that, and you're loading a pointer, that pointer can only point to global (CrossWorkgroup), which I think holds here as well because there's no legal way to put a private or a local (shared) pointer in there (if you do it at static init, before a kernel executes, you cannot form those types of addresses, if you do it as the kernel executes it's UB). Or are you worried about cases where global does not include constant?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think the routine is ok for a vanilla OpenCL environment but extensions may make it invalid.