@@ -402,7 +402,6 @@ struct ConvertNVGPUToNVVMPass
402
402
403
403
void runOnOperation () override {
404
404
LowerToLLVMOptions options (&getContext ());
405
- options.useOpaquePointers = useOpaquePointers;
406
405
RewritePatternSet patterns (&getContext ());
407
406
LLVMTypeConverter converter (&getContext (), options);
408
407
IRRewriter rewriter (&getContext ());
@@ -451,7 +450,7 @@ struct ConvertNVGPUToNVVMPass
451
450
nvgpu::getMBarrierMemrefType (rewriter.getContext (), type));
452
451
});
453
452
converter.addConversion ([&](nvgpu::TensorMapDescriptorType type) -> Type {
454
- return converter. getPointerType (type.getTensor (). getElementType ());
453
+ return LLVM::LLVMPointerType::get (type.getContext ());
455
454
});
456
455
populateNVGPUToNVVMConversionPatterns (converter, patterns);
457
456
LLVMConversionTarget target (getContext ());
@@ -651,16 +650,11 @@ struct NVGPUAsyncCopyLowering
651
650
Value dstPtr =
652
651
getStridedElementPtr (b.getLoc (), dstMemrefType, adaptor.getDst (),
653
652
adaptor.getDstIndices (), rewriter);
654
- auto i8Ty = IntegerType::get (op.getContext (), 8 );
655
653
FailureOr<unsigned > dstAddressSpace =
656
654
getTypeConverter ()->getMemRefAddressSpace (dstMemrefType);
657
655
if (failed (dstAddressSpace))
658
656
return rewriter.notifyMatchFailure (
659
657
loc, " destination memref address space not convertible to integer" );
660
- auto dstPointerType =
661
- getTypeConverter ()->getPointerType (i8Ty, *dstAddressSpace);
662
- if (!getTypeConverter ()->useOpaquePointers ())
663
- dstPtr = b.create <LLVM::BitcastOp>(dstPointerType, dstPtr);
664
658
665
659
auto srcMemrefType = cast<MemRefType>(op.getSrc ().getType ());
666
660
FailureOr<unsigned > srcAddressSpace =
@@ -671,13 +665,9 @@ struct NVGPUAsyncCopyLowering
671
665
672
666
Value scrPtr = getStridedElementPtr (loc, srcMemrefType, adaptor.getSrc (),
673
667
adaptor.getSrcIndices (), rewriter);
674
- auto srcPointerType =
675
- getTypeConverter ()->getPointerType (i8Ty, *srcAddressSpace);
676
- if (!getTypeConverter ()->useOpaquePointers ())
677
- scrPtr = b.create <LLVM::BitcastOp>(srcPointerType, scrPtr);
678
668
// Intrinsics takes a global pointer so we need an address space cast.
679
- auto srcPointerGlobalType = getTypeConverter ()-> getPointerType (
680
- i8Ty , NVVM::NVVMMemorySpace::kGlobalMemorySpace );
669
+ auto srcPointerGlobalType = LLVM::LLVMPointerType::get (
670
+ op-> getContext () , NVVM::NVVMMemorySpace::kGlobalMemorySpace );
681
671
scrPtr = b.create <LLVM::AddrSpaceCastOp>(srcPointerGlobalType, scrPtr);
682
672
int64_t dstElements = adaptor.getDstElements ().getZExtValue ();
683
673
int64_t sizeInBytes =
@@ -1128,8 +1118,7 @@ struct NVGPUTmaCreateDescriptorOpLowering
1128
1118
matchAndRewrite (nvgpu::TmaCreateDescriptorOp op, OpAdaptor adaptor,
1129
1119
ConversionPatternRewriter &rewriter) const override {
1130
1120
ImplicitLocOpBuilder b (op->getLoc (), rewriter);
1131
- LLVM::LLVMPointerType llvmPointerType = getTypeConverter ()->getPointerType (
1132
- IntegerType::get (op->getContext (), 8 ));
1121
+ auto llvmPointerType = LLVM::LLVMPointerType::get (op->getContext ());
1133
1122
Type llvmInt64Type = IntegerType::get (op->getContext (), 64 );
1134
1123
1135
1124
Value tensorElementType =
0 commit comments