Skip to content

Commit a175c07

Browse files
committed
fix flang
1 parent b3116a7 commit a175c07

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

flang/lib/Optimizer/CodeGen/CodeGen.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3202,7 +3202,8 @@ struct GlobalOpConversion : public fir::FIROpConversion<fir::GlobalOp> {
32023202

32033203
if (global.getDataAttr() &&
32043204
*global.getDataAttr() == cuf::DataAttribute::Shared)
3205-
g.setAddrSpace(mlir::NVVM::NVVMMemorySpace::kSharedMemorySpace);
3205+
g.setAddrSpace(
3206+
static_cast<unsigned>(mlir::NVVM::NVVMMemorySpace::Shared));
32063207

32073208
rewriter.eraseOp(global);
32083209
return mlir::success();

flang/lib/Optimizer/Transforms/CUFGPUToLLVMConversion.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,8 @@ static mlir::Value createAddressOfOp(mlir::ConversionPatternRewriter &rewriter,
221221
gpu::GPUModuleOp gpuMod,
222222
std::string &sharedGlobalName) {
223223
auto llvmPtrTy = mlir::LLVM::LLVMPointerType::get(
224-
rewriter.getContext(), mlir::NVVM::NVVMMemorySpace::kSharedMemorySpace);
224+
rewriter.getContext(),
225+
static_cast<unsigned>(mlir::NVVM::NVVMMemorySpace::Shared));
225226
if (auto g = gpuMod.lookupSymbol<fir::GlobalOp>(sharedGlobalName))
226227
return mlir::LLVM::AddressOfOp::create(rewriter, loc, llvmPtrTy,
227228
g.getSymName());

mlir/test/Dialect/LLVMIR/nvvm.mlir

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -620,7 +620,7 @@ func.func @prefetch_tensormap(%gen_ptr: !llvm.ptr, %const_ptr: !llvm.ptr<4>) {
620620
return
621621
}
622622

623-
// CHECK-LABEL: @nvvm_ptr_address_space
623+
// CHECK-LABEL: @nvvm_address_space
624624
func.func private @nvvm_address_space(
625625
!ptr.ptr<#nvvm.memory_space<global>>,
626626
!ptr.ptr<#nvvm.memory_space<shared>>,

0 commit comments

Comments
 (0)