Skip to content

Commit e650ac1

Browse files
clementvalclementval
authored
[flang][cuda][NFC] Fix typo in CUFAllocDescriptor (#120797)
Missing `r` in the function name.
1 parent 81831ef commit e650ac1

File tree

7 files changed

+19
-19
lines changed

7 files changed

+19
-19
lines changed

‎flang/include/flang/Runtime/CUDA/descriptor.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ namespace Fortran::runtime::cuda {
1818
extern "C" {
1919

2020
/// Allocate a descriptor in managed.
21-
Descriptor *RTDECL(CUFAllocDesciptor)(
21+
Descriptor *RTDECL(CUFAllocDescriptor)(
2222
std::size_t, const char *sourceFile = nullptr, int sourceLine = 0);
2323

2424
/// Deallocate a descriptor allocated in managed or unified memory.

‎flang/lib/Optimizer/CodeGen/CodeGen.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1210,12 +1210,12 @@ genCUFAllocDescriptor(mlir::Location loc,
12101210
llvmPointerType, {llvmIntPtrType, llvmPointerType, llvmInt32Type});
12111211

12121212
auto llvmFunc = mod.lookupSymbol<mlir::LLVM::LLVMFuncOp>(
1213-
RTNAME_STRING(CUFAllocDesciptor));
1213+
RTNAME_STRING(CUFAllocDescriptor));
12141214
auto funcFunc =
1215-
mod.lookupSymbol<mlir::func::FuncOp>(RTNAME_STRING(CUFAllocDesciptor));
1215+
mod.lookupSymbol<mlir::func::FuncOp>(RTNAME_STRING(CUFAllocDescriptor));
12161216
if (!llvmFunc && !funcFunc)
12171217
mlir::OpBuilder::atBlockEnd(mod.getBody())
1218-
.create<mlir::LLVM::LLVMFuncOp>(loc, RTNAME_STRING(CUFAllocDesciptor),
1218+
.create<mlir::LLVM::LLVMFuncOp>(loc, RTNAME_STRING(CUFAllocDescriptor),
12191219
fctTy);
12201220

12211221
mlir::Type structTy = typeConverter.convertBoxTypeAsStruct(boxTy);
@@ -1224,7 +1224,7 @@ genCUFAllocDescriptor(mlir::Location loc,
12241224
genConstantIndex(loc, llvmIntPtrType, rewriter, boxSize);
12251225
llvm::SmallVector args = {sizeInBytes, sourceFile, sourceLine};
12261226
return rewriter
1227-
.create<mlir::LLVM::CallOp>(loc, fctTy, RTNAME_STRING(CUFAllocDesciptor),
1227+
.create<mlir::LLVM::CallOp>(loc, fctTy, RTNAME_STRING(CUFAllocDescriptor),
12281228
args)
12291229
.getResult();
12301230
}
@@ -1735,7 +1735,7 @@ static bool isDeviceAllocation(mlir::Value val) {
17351735
(callOp.getCallee().value().getRootReference().getValue().starts_with(
17361736
RTNAME_STRING(CUFMemAlloc)) ||
17371737
callOp.getCallee().value().getRootReference().getValue().starts_with(
1738-
RTNAME_STRING(CUFAllocDesciptor))))
1738+
RTNAME_STRING(CUFAllocDescriptor))))
17391739
return true;
17401740
return false;
17411741
}
@@ -3127,7 +3127,7 @@ struct LoadOpConversion : public fir::FIROpConversion<fir::LoadOp> {
31273127
inputBoxStorage.getDefiningOp())) {
31283128
if (callOp.getCallee() &&
31293129
(*callOp.getCallee())
3130-
.starts_with(RTNAME_STRING(CUFAllocDesciptor))) {
3130+
.starts_with(RTNAME_STRING(CUFAllocDescriptor))) {
31313131
// CUDA Fortran local descriptor are allocated in managed memory. So
31323132
// new storage must be allocated the same way.
31333133
auto mod = load->getParentOfType<mlir::ModuleOp>();

‎flang/lib/Optimizer/Transforms/CUFOpConversion.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,7 @@ struct CUFAllocOpConversion : public mlir::OpRewritePattern<cuf::AllocOp> {
342342
// Convert descriptor allocations to function call.
343343
auto boxTy = mlir::dyn_cast_or_null<fir::BaseBoxType>(op.getInType());
344344
mlir::func::FuncOp func =
345-
fir::runtime::getRuntimeFunc<mkRTKey(CUFAllocDesciptor)>(loc, builder);
345+
fir::runtime::getRuntimeFunc<mkRTKey(CUFAllocDescriptor)>(loc, builder);
346346
auto fTy = func.getFunctionType();
347347
mlir::Value sourceLine =
348348
fir::factory::locationToLineNo(builder, loc, fTy.getInput(2));

‎flang/runtime/CUDA/descriptor.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ namespace Fortran::runtime::cuda {
1818
extern "C" {
1919
RT_EXT_API_GROUP_BEGIN
2020

21-
Descriptor *RTDEF(CUFAllocDesciptor)(
21+
Descriptor *RTDEF(CUFAllocDescriptor)(
2222
std::size_t sizeInBytes, const char *sourceFile, int sourceLine) {
2323
return reinterpret_cast<Descriptor *>(CUFAllocManaged(sizeInBytes));
2424
}

‎flang/test/Fir/CUDA/cuda-allocate.fir‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ func.func @_QPsub1() {
1515
}
1616

1717
// CHECK-LABEL: func.func @_QPsub1()
18-
// CHECK: %[[DESC_RT_CALL:.*]] = fir.call @_FortranACUFAllocDesciptor(%{{.*}}, %{{.*}}, %{{.*}}) : (i64, !fir.ref<i8>, i32) -> !fir.ref<!fir.box<none>>
18+
// CHECK: %[[DESC_RT_CALL:.*]] = fir.call @_FortranACUFAllocDescriptor(%{{.*}}, %{{.*}}, %{{.*}}) : (i64, !fir.ref<i8>, i32) -> !fir.ref<!fir.box<none>>
1919
// CHECK: %[[DESC:.*]] = fir.convert %[[DESC_RT_CALL]] : (!fir.ref<!fir.box<none>>) -> !fir.ref<!fir.box<!fir.heap<!fir.array<?xf32>>>>
2020
// CHECK: %[[DECL_DESC:.*]]:2 = hlfir.declare %[[DESC]] {data_attr = #cuf.cuda<device>, fortran_attrs = #fir.var_attrs<allocatable>, uniq_name = "_QFsub1Ea"} : (!fir.ref<!fir.box<!fir.heap<!fir.array<?xf32>>>>) -> (!fir.ref<!fir.box<!fir.heap<!fir.array<?xf32>>>>, !fir.ref<!fir.box<!fir.heap<!fir.array<?xf32>>>>)
2121
// CHECK: %[[BOX_NONE:.*]] = fir.convert %[[DECL_DESC]]#1 : (!fir.ref<!fir.box<!fir.heap<!fir.array<?xf32>>>>) -> !fir.ref<!fir.box<none>>

‎flang/test/Fir/CUDA/cuda-code-gen.mlir‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ module attributes {dlti.dl_spec = #dlti.dl_spec<#dlti.dl_entry<f80, dense<128> :
88
%c48 = arith.constant 48 : index
99
%1 = fir.convert %c48 : (index) -> i64
1010
%2 = fir.convert %0 : (!fir.ref<!fir.char<1,8>>) -> !fir.ref<i8>
11-
%3 = fir.call @_FortranACUFAllocDesciptor(%1, %2, %c4_i32) : (i64, !fir.ref<i8>, i32) -> !fir.ref<!fir.box<none>>
11+
%3 = fir.call @_FortranACUFAllocDescriptor(%1, %2, %c4_i32) : (i64, !fir.ref<i8>, i32) -> !fir.ref<!fir.box<none>>
1212
%4 = fir.convert %3 : (!fir.ref<!fir.box<none>>) -> !fir.ref<!fir.box<!fir.heap<!fir.array<?xi32>>>>
1313
%5 = fir.zero_bits !fir.heap<!fir.array<?xi32>>
1414
%6 = fircg.ext_embox %5(%c0) {allocator_idx = 2 : i32} : (!fir.heap<!fir.array<?xi32>>, index) -> !fir.box<!fir.heap<!fir.array<?xi32>>>
@@ -18,13 +18,13 @@ module attributes {dlti.dl_spec = #dlti.dl_spec<#dlti.dl_entry<f80, dense<128> :
1818
}
1919

2020
// CHECK-LABEL: llvm.func @_QQmain()
21-
// CHECK-COUNT-2: llvm.call @_FortranACUFAllocDesciptor
21+
// CHECK-COUNT-2: llvm.call @_FortranACUFAllocDescriptor
2222

2323
fir.global linkonce @_QQclX3C737464696E3E00 constant : !fir.char<1,8> {
2424
%0 = fir.string_lit "<stdin>\00"(8) : !fir.char<1,8>
2525
fir.has_value %0 : !fir.char<1,8>
2626
}
27-
func.func private @_FortranACUFAllocDesciptor(i64, !fir.ref<i8>, i32) -> !fir.ref<!fir.box<none>> attributes {fir.runtime}
27+
func.func private @_FortranACUFAllocDescriptor(i64, !fir.ref<i8>, i32) -> !fir.ref<!fir.box<none>> attributes {fir.runtime}
2828
}
2929

3030
// -----
@@ -55,7 +55,7 @@ module attributes {dlti.dl_spec = #dlti.dl_spec<f80 = dense<128> : vector<2xi64>
5555

5656
// CHECK-LABEL: llvm.func @_QQmain()
5757
// CHECK: llvm.call @_FortranACUFMemAlloc
58-
// CHECK: llvm.call @_FortranACUFAllocDesciptor
58+
// CHECK: llvm.call @_FortranACUFAllocDescriptor
5959

6060
// -----
6161

@@ -73,7 +73,7 @@ module attributes {dlti.dl_spec = #dlti.dl_spec<f80 = dense<128> : vector<2xi64>
7373
%c72 = arith.constant 72 : index
7474
%3 = fir.convert %c72 : (index) -> i64
7575
%4 = fir.convert %2 : (!fir.ref<!fir.char<1,11>>) -> !fir.ref<i8>
76-
%5 = fir.call @_FortranACUFAllocDesciptor(%3, %4, %c14_i32) : (i64, !fir.ref<i8>, i32) -> !fir.ref<!fir.box<none>>
76+
%5 = fir.call @_FortranACUFAllocDescriptor(%3, %4, %c14_i32) : (i64, !fir.ref<i8>, i32) -> !fir.ref<!fir.box<none>>
7777
%6 = fir.convert %5 : (!fir.ref<!fir.box<none>>) -> !fir.ref<!fir.box<!fir.heap<!fir.array<?x?xf32>>>>
7878
%7 = fir.zero_bits !fir.heap<!fir.array<?x?xf32>>
7979
%8 = fircg.ext_embox %7(%c0, %c0) {allocator_idx = 2 : i32} : (!fir.heap<!fir.array<?x?xf32>>, index, index) -> !fir.box<!fir.heap<!fir.array<?x?xf32>>>
@@ -83,7 +83,7 @@ module attributes {dlti.dl_spec = #dlti.dl_spec<f80 = dense<128> : vector<2xi64>
8383
%c48 = arith.constant 48 : index
8484
%10 = fir.convert %c48 : (index) -> i64
8585
%11 = fir.convert %9 : (!fir.ref<!fir.char<1,11>>) -> !fir.ref<i8>
86-
%12 = fir.call @_FortranACUFAllocDesciptor(%10, %11, %c20_i32) : (i64, !fir.ref<i8>, i32) -> !fir.ref<!fir.box<none>>
86+
%12 = fir.call @_FortranACUFAllocDescriptor(%10, %11, %c20_i32) : (i64, !fir.ref<i8>, i32) -> !fir.ref<!fir.box<none>>
8787
%13 = fir.convert %12 : (!fir.ref<!fir.box<none>>) -> !fir.ref<!fir.box<!fir.heap<!fir.array<?xf32>>>>
8888
%14 = fir.zero_bits !fir.heap<!fir.array<?xf32>>
8989
%15 = fircg.ext_embox %14(%c0) {allocator_idx = 2 : i32} : (!fir.heap<!fir.array<?xf32>>, index) -> !fir.box<!fir.heap<!fir.array<?xf32>>>
@@ -120,9 +120,9 @@ module attributes {dlti.dl_spec = #dlti.dl_spec<f80 = dense<128> : vector<2xi64>
120120
%0 = fir.string_lit "dummy.mlir\00"(11) : !fir.char<1,11>
121121
fir.has_value %0 : !fir.char<1,11>
122122
}
123-
func.func private @_FortranACUFAllocDesciptor(i64, !fir.ref<i8>, i32) -> !fir.ref<!fir.box<none>> attributes {fir.runtime}
123+
func.func private @_FortranACUFAllocDescriptor(i64, !fir.ref<i8>, i32) -> !fir.ref<!fir.box<none>> attributes {fir.runtime}
124124
func.func private @_FortranACUFAllocatableAllocate(!fir.ref<!fir.box<none>>, i64, i1, !fir.box<none>, !fir.ref<i8>, i32) -> i32 attributes {fir.runtime}
125125
}
126126

127127
// CHECK-LABEL: llvm.func @_QQmain()
128-
// CHECK-COUNT-4: llvm.call @_FortranACUFAllocDesciptor
128+
// CHECK-COUNT-4: llvm.call @_FortranACUFAllocDescriptor

‎flang/unittests/Runtime/CUDA/AllocatorCUF.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ TEST(AllocatableCUFTest, DescriptorAllocationTest) {
6666
// REAL(4), DEVICE, ALLOCATABLE :: a(:)
6767
auto a{createAllocatable(TypeCategory::Real, 4)};
6868
Descriptor *desc = nullptr;
69-
desc = RTNAME(CUFAllocDesciptor)(a->SizeInBytes());
69+
desc = RTNAME(CUFAllocDescriptor)(a->SizeInBytes());
7070
EXPECT_TRUE(desc != nullptr);
7171
RTNAME(CUFFreeDesciptor)(desc);
7272
}

0 commit comments

Comments
 (0)