Skip to content

Commit 05b52ef

Browse files
authored
[flang][cuda][NFC] Update to the new create APIs (#152050)
Some operation creations were updated in flang directory but not all. Migrate the CUF ops to the new create APIs introduce in #147168
1 parent abc394c commit 05b52ef

File tree

5 files changed

+17
-17
lines changed

5 files changed

+17
-17
lines changed

flang/lib/Lower/Allocatable.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -771,10 +771,11 @@ class AllocateStmtHelper {
771771

772772
// Keep return type the same as a standard AllocatableAllocate call.
773773
mlir::Type retTy = fir::runtime::getModel<int>()(builder.getContext());
774-
return builder
775-
.create<cuf::AllocateOp>(
776-
loc, retTy, box.getAddr(), errmsg, stream, pinned, source, cudaAttr,
777-
errorManager.hasStatSpec() ? builder.getUnitAttr() : nullptr)
774+
775+
return cuf::AllocateOp::create(
776+
builder, loc, retTy, box.getAddr(), errmsg, stream, pinned,
777+
source, cudaAttr,
778+
errorManager.hasStatSpec() ? builder.getUnitAttr() : nullptr)
778779
.getResult();
779780
}
780781

@@ -840,10 +841,9 @@ static mlir::Value genCudaDeallocate(fir::FirOpBuilder &builder,
840841

841842
// Keep return type the same as a standard AllocatableAllocate call.
842843
mlir::Type retTy = fir::runtime::getModel<int>()(builder.getContext());
843-
return builder
844-
.create<cuf::DeallocateOp>(
845-
loc, retTy, box.getAddr(), errmsg, cudaAttr,
846-
errorManager.hasStatSpec() ? builder.getUnitAttr() : nullptr)
844+
return cuf::DeallocateOp::create(
845+
builder, loc, retTy, box.getAddr(), errmsg, cudaAttr,
846+
errorManager.hasStatSpec() ? builder.getUnitAttr() : nullptr)
847847
.getResult();
848848
}
849849

flang/lib/Lower/Bridge.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3436,8 +3436,8 @@ class FirConverter : public Fortran::lower::AbstractConverter {
34363436
}
34373437
}
34383438

3439-
auto op = builder->create<cuf::KernelOp>(
3440-
loc, gridValues, blockValues, streamAddr, lbs, ubs, steps, n,
3439+
auto op = cuf::KernelOp::create(
3440+
*builder, loc, gridValues, blockValues, streamAddr, lbs, ubs, steps, n,
34413441
mlir::ValueRange(reduceOperands), builder->getArrayAttr(reduceAttrs));
34423442
builder->createBlock(&op.getRegion(), op.getRegion().end(), ivTypes,
34433443
ivLocs);

flang/lib/Lower/ConvertVariable.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1239,7 +1239,7 @@ static void instantiateLocal(Fortran::lower::AbstractConverter &converter,
12391239
cuf::DataAttributeAttr dataAttr =
12401240
Fortran::lower::translateSymbolCUFDataAttribute(
12411241
builder->getContext(), *sym);
1242-
builder->create<cuf::FreeOp>(loc, fir::getBase(exv), dataAttr);
1242+
cuf::FreeOp::create(*builder, loc, fir::getBase(exv), dataAttr);
12431243
});
12441244
}
12451245
}

flang/lib/Optimizer/Builder/FIRBuilder.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -324,8 +324,9 @@ mlir::Value fir::FirOpBuilder::createTemporaryAlloc(
324324
getRegion().getParentOfType<mlir::omp::OutlineableOpenMPOpInterface>();
325325
if (cudaAttr) {
326326
cuf::DataAttributeAttr attr = cuf::getDataAttribute(getContext(), cudaAttr);
327-
return create<cuf::AllocOp>(loc, type, /*unique_name=*/llvm::StringRef{},
328-
name, attr, lenParams, shape, attrs);
327+
return cuf::AllocOp::create(*this, loc, type,
328+
/*unique_name=*/llvm::StringRef{}, name, attr,
329+
lenParams, shape, attrs);
329330
} else {
330331
return create<fir::AllocaOp>(loc, type, /*unique_name=*/llvm::StringRef{},
331332
name, pinned, lenParams, shape, attrs);

flang/lib/Optimizer/Transforms/CUFOpConversion.cpp

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -860,10 +860,9 @@ struct CUFLaunchOpConversion
860860
if (auto global = symTab.lookup<fir::GlobalOp>(
861861
addrOfOp.getSymbol().getRootReference().getValue())) {
862862
if (cuf::isRegisteredDeviceGlobal(global)) {
863-
arg = rewriter
864-
.create<cuf::DeviceAddressOp>(op.getLoc(),
865-
addrOfOp.getType(),
866-
addrOfOp.getSymbol())
863+
arg = cuf::DeviceAddressOp::create(rewriter, op.getLoc(),
864+
addrOfOp.getType(),
865+
addrOfOp.getSymbol())
867866
.getResult();
868867
}
869868
}

0 commit comments

Comments
 (0)