From a115dff36c45bf7acbf3be2b1fb321e87bafef2f Mon Sep 17 00:00:00 2001 From: Tom Eccles Date: Fri, 4 Jul 2025 13:48:47 +0000 Subject: [PATCH] [flang] Fix tests broken by #146734 These tests referred to privatizers which were never declared --- flang/test/Fir/convert-nontemporal-to-llvm.fir | 18 +++++++++--------- flang/test/Fir/simd-nontemporal.fir | 12 ++++++------ 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/flang/test/Fir/convert-nontemporal-to-llvm.fir b/flang/test/Fir/convert-nontemporal-to-llvm.fir index 6200ef1c621d7..e0a836ab0dad1 100644 --- a/flang/test/Fir/convert-nontemporal-to-llvm.fir +++ b/flang/test/Fir/convert-nontemporal-to-llvm.fir @@ -14,7 +14,7 @@ // CHECK: %[[VAL5:.*]] = llvm.alloca %[[CONST_VAL4]] x i32 {bindc_name = "a"} : (i64) -> !llvm.ptr // CHECK: %[[CONST_VAL5:.*]] = llvm.mlir.constant(1 : i32) : i32 // CHECK: %[[VAL6:.*]] = llvm.load %[[VAL1]] : !llvm.ptr -> i32 -// CHECK: omp.simd nontemporal(%[[VAL5]], %[[VAL3]] : !llvm.ptr, !llvm.ptr) private(@_QFtestEi_private_i32 %[[VAL2]] -> %arg0 : !llvm.ptr) { +// CHECK: omp.simd nontemporal(%[[VAL5]], %[[VAL3]] : !llvm.ptr, !llvm.ptr) { // CHECK: omp.loop_nest (%{{.*}}) : i32 = (%[[CONST_VAL5]]) to (%[[VAL6]]) inclusive step (%[[CONST_VAL5]]) { // CHECK: llvm.store %{{.*}}, %{{.*}} : i32, !llvm.ptr // CHECK: %[[VAL8:.*]] = llvm.load %[[VAL5]] {nontemporal} : !llvm.ptr -> i32 @@ -33,9 +33,9 @@ %3 = fir.alloca i32 {bindc_name = "i", uniq_name = "_QFtestEi"} %4 = fir.alloca i32 {bindc_name = "n", uniq_name = "_QFtestEn"} %5 = fir.load %4 : !fir.ref - omp.simd nontemporal(%0, %2 : !fir.ref, !fir.ref) private(@_QFtestEi_private_i32 %3 -> %arg0 : !fir.ref) { + omp.simd nontemporal(%0, %2 : !fir.ref, !fir.ref) { omp.loop_nest (%arg1) : i32 = (%c1_i32) to (%5) inclusive step (%c1_i32) { - fir.store %arg1 to %arg0 : !fir.ref + fir.store %arg1 to %3 : !fir.ref %6 = fir.load %0 {nontemporal}: !fir.ref %7 = fir.load %1 : !fir.ref %8 = arith.addi %6, %7 : i32 @@ -52,12 +52,12 @@ // CHECK: %[[IDX_VAL:.*]] = llvm.mlir.constant(1 : i32) : i32 // CHECK: %[[CONST_VAL1:.*]] = llvm.mlir.constant(0 : index) : i64 // CHECK: %[[END_IDX:.*]] = llvm.mlir.constant(100 : i32) : i32 -// CHECK: omp.simd nontemporal(%[[ARG0:.*]] : !llvm.ptr) private(@_QFsimd_nontemporal_allocatableEi_private_i32 %[[ALLOCA2]] -> %[[ARG2:.*]] : !llvm.ptr) { +// CHECK: omp.simd nontemporal(%[[ARG0:.*]] : !llvm.ptr) { // CHECK: omp.loop_nest (%[[ARG3:.*]]) : i32 = (%[[IDX_VAL]]) to (%[[END_IDX]]) inclusive step (%[[IDX_VAL]]) { -// CHECK: llvm.store %[[ARG3]], %[[ARG2]] : i32, !llvm.ptr +// CHECK: llvm.store %[[ARG3]], %{{.*}} : i32, !llvm.ptr // CHECK: %[[CONST_VAL2:.*]] = llvm.mlir.constant(48 : i32) : i32 // CHECK: "llvm.intr.memcpy"(%[[ALLOCA1:.*]], %[[ARG0]], %[[CONST_VAL2]]) <{isVolatile = false}> : (!llvm.ptr, !llvm.ptr, i32) -> () -// CHECK: %[[VAL1:.*]] = llvm.load %[[ARG2]] : !llvm.ptr -> i32 +// CHECK: %[[VAL1:.*]] = llvm.load %{{.*}} : !llvm.ptr -> i32 // CHECK: %[[VAL2:.*]] = llvm.sext %[[VAL1]] : i32 to i64 // CHECK: %[[VAL3:.*]] = llvm.getelementptr %[[ALLOCA1]][0, 0] : (!llvm.ptr) -> !llvm.ptr, !llvm.struct<(ptr, i64, i32, i8, i8, i8, i8, array<1 x array<3 x i64>>)> // CHECK: %[[VAL4:.*]] = llvm.load %[[VAL3]] : !llvm.ptr -> !llvm.ptr @@ -91,11 +91,11 @@ %1 = fir.allocmem !fir.array, %c100 {fir.must_be_heap = true, uniq_name = "_QFsimd_nontemporal_allocatableEx.alloc"} %2 = fircg.ext_embox %1(%c100) : (!fir.heap>, index) -> !fir.box>> fir.store %2 to %arg0 : !fir.ref>>> - omp.simd nontemporal(%arg0 : !fir.ref>>>) private(@_QFsimd_nontemporal_allocatableEi_private_i32 %0 -> %arg2 : !fir.ref) { + omp.simd nontemporal(%arg0 : !fir.ref>>>) { omp.loop_nest (%arg3) : i32 = (%c1_i32) to (%c100_i32) inclusive step (%c1_i32) { - fir.store %arg3 to %arg2 : !fir.ref + fir.store %arg3 to %0 : !fir.ref %7 = fir.load %arg0 : !fir.ref>>> - %8 = fir.load %arg2 : !fir.ref + %8 = fir.load %0 : !fir.ref %9 = fir.convert %8 : (i32) -> i64 %10 = fir.box_addr %7 : (!fir.box>>) -> !fir.heap> %11:3 = fir.box_dims %7, %c0 : (!fir.box>>, index) -> (index, index, index) diff --git a/flang/test/Fir/simd-nontemporal.fir b/flang/test/Fir/simd-nontemporal.fir index 31051ff52f9bd..a58bf01a60980 100644 --- a/flang/test/Fir/simd-nontemporal.fir +++ b/flang/test/Fir/simd-nontemporal.fir @@ -17,11 +17,11 @@ func.func @_QPsimd_with_nontemporal_clause(%arg0: !fir.ref {fir.bindc_name %8 = fir.declare %7 {uniq_name = "_QFsimd_with_nontemporal_clauseEi"} : (!fir.ref) -> !fir.ref %9 = fir.declare %arg0 dummy_scope %0 {uniq_name = "_QFsimd_with_nontemporal_clauseEn"} : (!fir.ref, !fir.dscope) -> !fir.ref %10 = fir.load %9 : !fir.ref - // CHECK: omp.simd nontemporal(%[[A_DECL]], %[[C_DECL]] : !fir.ref, !fir.ref) private(@_QFsimd_with_nontemporal_clauseEi_private_i32 %8 -> %arg1 : !fir.ref) { + // CHECK: omp.simd nontemporal(%[[A_DECL]], %[[C_DECL]] : !fir.ref, !fir.ref) { // CHECK-NEXT: omp.loop_nest (%{{.*}}) : i32 = (%{{.*}}) to (%{{.*}}) inclusive step (%{{.*}}) { - omp.simd nontemporal(%2, %6 : !fir.ref, !fir.ref) private(@_QFsimd_with_nontemporal_clauseEi_private_i32 %8 -> %arg1 : !fir.ref) { + omp.simd nontemporal(%2, %6 : !fir.ref, !fir.ref) { omp.loop_nest (%arg2) : i32 = (%c1_i32) to (%10) inclusive step (%c1_i32) { - %11 = fir.declare %arg1 {uniq_name = "_QFsimd_with_nontemporal_clauseEi"} : (!fir.ref) -> !fir.ref + %11 = fir.declare %8 {uniq_name = "_QFsimd_with_nontemporal_clauseEi"} : (!fir.ref) -> !fir.ref fir.store %arg2 to %11 : !fir.ref // CHECK: %[[LOAD:.*]] = fir.load %[[A_DECL]] {nontemporal} : !fir.ref %12 = fir.load %2 : !fir.ref @@ -56,11 +56,11 @@ func.func @_QPsimd_nontemporal_allocatable(%arg0: !fir.ref !fir.shape<1> %10 = fir.embox %8(%9) : (!fir.heap>, !fir.shape<1>) -> !fir.box>> fir.store %10 to %3 : !fir.ref>>> - // CHECK: omp.simd nontemporal(%[[X_DECL]] : !fir.ref>>>) private(@_QFsimd_nontemporal_allocatableEi_private_i32 %2 -> %arg2 : !fir.ref) { + // CHECK: omp.simd nontemporal(%[[X_DECL]] : !fir.ref>>>) { // CHECK: omp.loop_nest (%{{.*}}) : i32 = (%{{.*}}) to (%{{.*}}) inclusive step (%{{.*}}) { - omp.simd nontemporal(%3 : !fir.ref>>>) private(@_QFsimd_nontemporal_allocatableEi_private_i32 %2 -> %arg2 : !fir.ref) { + omp.simd nontemporal(%3 : !fir.ref>>>) { omp.loop_nest (%arg3) : i32 = (%c1_i32) to (%c100_i32) inclusive step (%c1_i32) { - %16 = fir.declare %arg2 {uniq_name = "_QFsimd_nontemporal_allocatableEi"} : (!fir.ref) -> !fir.ref + %16 = fir.declare %2 {uniq_name = "_QFsimd_nontemporal_allocatableEi"} : (!fir.ref) -> !fir.ref fir.store %arg3 to %16 : !fir.ref // CHECK: %[[VAL1:.*]] = fir.load %[[X_DECL]] : !fir.ref>>> %17 = fir.load %3 : !fir.ref>>>