From: PeixinQiao Date: Mon, 23 May 2022 14:50:06 +0000 (+0800) Subject: [NFC][flang] Change the OpenMP atomic read/write test cases X-Git-Tag: upstream/15.0.7~6988 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b050686c4b30c53486955097d8678d43f97fef85;p=platform%2Fupstream%2Fllvm.git [NFC][flang] Change the OpenMP atomic read/write test cases Remove the integration tests and rename the file. Reviewed By: shraiysh, NimishMishra Differential Revision: https://reviews.llvm.org/D126169 --- diff --git a/flang/test/Lower/OpenMP/atomic-read.f90 b/flang/test/Lower/OpenMP/atomic-read.f90 new file mode 100644 index 0000000..36ad61ff --- /dev/null +++ b/flang/test/Lower/OpenMP/atomic-read.f90 @@ -0,0 +1,46 @@ +! RUN: bbc -fopenmp -emit-fir %s -o - | FileCheck %s + +! This test checks the lowering of atomic read + +!CHECK: func @_QQmain() { +!CHECK: %[[VAR_A:.*]] = fir.address_of(@_QFEa) : !fir.ref> +!CHECK: %[[VAR_B:.*]] = fir.address_of(@_QFEb) : !fir.ref> +!CHECK: %[[VAR_C:.*]] = fir.alloca !fir.logical<4> {bindc_name = "c", uniq_name = "_QFEc"} +!CHECK: %[[VAR_D:.*]] = fir.alloca !fir.logical<4> {bindc_name = "d", uniq_name = "_QFEd"} +!CHECK: %[[VAR_E:.*]] = fir.address_of(@_QFEe) : !fir.ref> +!CHECK: %[[VAR_F:.*]] = fir.address_of(@_QFEf) : !fir.ref> +!CHECK: %[[VAR_G:.*]] = fir.alloca f32 {bindc_name = "g", uniq_name = "_QFEg"} +!CHECK: %[[VAR_H:.*]] = fir.alloca f32 {bindc_name = "h", uniq_name = "_QFEh"} +!CHECK: %[[VAR_X:.*]] = fir.alloca i32 {bindc_name = "x", uniq_name = "_QFEx"} +!CHECK: %[[VAR_Y:.*]] = fir.alloca i32 {bindc_name = "y", uniq_name = "_QFEy"} +!CHECK: omp.atomic.read %[[VAR_X]] = %[[VAR_Y]] memory_order(acquire) hint(uncontended) : !fir.ref +!CHECK: omp.atomic.read %[[VAR_A]] = %[[VAR_B]] memory_order(relaxed) hint(none) : !fir.ref> +!CHECK: omp.atomic.read %[[VAR_C]] = %[[VAR_D]] memory_order(seq_cst) hint(contended) : !fir.ref> +!CHECK: omp.atomic.read %[[VAR_E]] = %[[VAR_F]] hint(speculative) : !fir.ref> +!CHECK: omp.atomic.read %[[VAR_G]] = %[[VAR_H]] hint(nonspeculative) : !fir.ref +!CHECK: omp.atomic.read %[[VAR_G]] = %[[VAR_H]] : !fir.ref +!CHECK: return +!CHECK: } + +program OmpAtomic + + use omp_lib + integer :: x, y + character :: a, b + logical :: c, d + character(8) :: e, f + real g, h + !$omp atomic acquire read hint(omp_sync_hint_uncontended) + x = y + !$omp atomic relaxed read hint(omp_sync_hint_none) + a = b + !$omp atomic read seq_cst hint(omp_sync_hint_contended) + c = d + !$omp atomic read hint(omp_sync_hint_speculative) + e = f + !$omp atomic read hint(omp_sync_hint_nonspeculative) + g = h + !$omp atomic read + g = h +end program OmpAtomic + diff --git a/flang/test/Lower/OpenMP/atomic-write.f90 b/flang/test/Lower/OpenMP/atomic-write.f90 new file mode 100644 index 0000000..1a9c264 --- /dev/null +++ b/flang/test/Lower/OpenMP/atomic-write.f90 @@ -0,0 +1,38 @@ +! RUN: bbc -fopenmp -emit-fir %s -o - | FileCheck %s + +! This test checks the lowering of atomic write + +!CHECK: func @_QQmain() { +!CHECK: %[[VAR_X:.*]] = fir.alloca i32 {bindc_name = "x", uniq_name = "_QFEx"} +!CHECK: %[[VAR_Y:.*]] = fir.alloca i32 {bindc_name = "y", uniq_name = "_QFEy"} +!CHECK: %[[VAR_Z:.*]] = fir.alloca i32 {bindc_name = "z", uniq_name = "_QFEz"} +!CHECK: %[[CONST_44:.*]] = arith.constant 44 : i32 +!CHECK: omp.atomic.write %[[VAR_X]] = %[[CONST_44]] hint(uncontended) memory_order(seq_cst) : !fir.ref, i32 +!CHECK: %[[CONST_7:.*]] = arith.constant 7 : i32 +!CHECK: {{.*}} = fir.load %[[VAR_Y]] : !fir.ref +!CHECK: %[[VAR_7y:.*]] = arith.muli %[[CONST_7]], {{.*}} : i32 +!CHECK: omp.atomic.write %[[VAR_X]] = %[[VAR_7y]] memory_order(relaxed) : !fir.ref, i32 +!CHECK: %[[CONST_10:.*]] = arith.constant 10 : i32 +!CHECK: {{.*}} = fir.load %[[VAR_X]] : !fir.ref +!CHECK: {{.*}} = arith.muli %[[CONST_10]], {{.*}} : i32 +!CHECK: {{.*}} = fir.load %[[VAR_Z]] : !fir.ref +!CHECK: %[[CONST_2:.*]] = arith.constant 2 : i32 +!CHECK: {{.*}} = arith.divsi {{.*}}, %[[CONST_2]] : i32 +!CHECK: {{.*}} = arith.addi {{.*}}, {{.*}} : i32 +!CHECK: omp.atomic.write %[[VAR_Y]] = {{.*}} hint(speculative) memory_order(release) : !fir.ref, i32 +!CHECK: return +!CHECK: } + +program OmpAtomicWrite + use omp_lib + integer :: x, y, z + !$omp atomic seq_cst write hint(omp_sync_hint_uncontended) + x = 8*4 + 12 + + !$omp atomic write relaxed + x = 7 * y + + !$omp atomic write release hint(omp_sync_hint_speculative) + y = 10*x + z/2 +end program OmpAtomicWrite + diff --git a/flang/test/Lower/OpenMP/atomic01.f90 b/flang/test/Lower/OpenMP/atomic01.f90 deleted file mode 100644 index 082181d..0000000 --- a/flang/test/Lower/OpenMP/atomic01.f90 +++ /dev/null @@ -1,74 +0,0 @@ -! RUN: bbc -fopenmp -emit-fir %s -o - | \ -! RUN: FileCheck %s --check-prefix=FIRDialect -! RUN: bbc -fopenmp %s -o - | fir-opt --fir-to-llvm-ir | \ -! RUN: FileCheck %s --check-prefix=LLVMDialect - -! This test checks the lowering of atomic read - -!FIRDialect: func @_QQmain() { -!FIRDialect: %[[VAR_A:.*]] = fir.address_of(@_QFEa) : !fir.ref> -!FIRDialect: %[[VAR_B:.*]] = fir.address_of(@_QFEb) : !fir.ref> -!FIRDialect: %[[VAR_C:.*]] = fir.alloca !fir.logical<4> {bindc_name = "c", uniq_name = "_QFEc"} -!FIRDialect: %[[VAR_D:.*]] = fir.alloca !fir.logical<4> {bindc_name = "d", uniq_name = "_QFEd"} -!FIRDialect: %[[VAR_E:.*]] = fir.address_of(@_QFEe) : !fir.ref> -!FIRDialect: %[[VAR_F:.*]] = fir.address_of(@_QFEf) : !fir.ref> -!FIRDialect: %[[VAR_G:.*]] = fir.alloca f32 {bindc_name = "g", uniq_name = "_QFEg"} -!FIRDialect: %[[VAR_H:.*]] = fir.alloca f32 {bindc_name = "h", uniq_name = "_QFEh"} -!FIRDialect: %[[VAR_X:.*]] = fir.alloca i32 {bindc_name = "x", uniq_name = "_QFEx"} -!FIRDialect: %[[VAR_Y:.*]] = fir.alloca i32 {bindc_name = "y", uniq_name = "_QFEy"} -!FIRDialect: omp.atomic.read %[[VAR_X]] = %[[VAR_Y]] memory_order(acquire) hint(uncontended) : !fir.ref -!FIRDialect: omp.atomic.read %[[VAR_A]] = %[[VAR_B]] memory_order(relaxed) hint(none) : !fir.ref> -!FIRDialect: omp.atomic.read %[[VAR_C]] = %[[VAR_D]] memory_order(seq_cst) hint(contended) : !fir.ref> -!FIRDialect: omp.atomic.read %[[VAR_E]] = %[[VAR_F]] hint(speculative) : !fir.ref> -!FIRDialect: omp.atomic.read %[[VAR_G]] = %[[VAR_H]] hint(nonspeculative) : !fir.ref -!FIRDialect: omp.atomic.read %[[VAR_G]] = %[[VAR_H]] : !fir.ref -!FIRDialect: return -!FIRDialect: } - -!LLVMDialect: llvm.func @_QQmain() { -!LLVMDialect: %[[LLVM_VAR_A:.*]] = llvm.mlir.addressof @_QFEa : !llvm.ptr> -!LLVMDialect: %[[LLVM_VAR_B:.*]] = llvm.mlir.addressof @_QFEb : !llvm.ptr> -!LLVMDialect: {{.*}} = llvm.mlir.constant(1 : i64) : i64 -!LLVMDialect: %[[LLVM_VAR_C:.*]] = llvm.alloca {{.*}} x i32 {bindc_name = "c", in_type = !fir.logical<4>, operand_segment_sizes = dense<0> : vector<2xi32>, uniq_name = "_QFEc"} : (i64) -> !llvm.ptr -!LLVMDialect: {{.*}} = llvm.mlir.constant(1 : i64) : i64 -!LLVMDialect: %[[LLVM_VAR_D:.*]] = llvm.alloca {{.*}} x i32 {bindc_name = "d", in_type = !fir.logical<4>, operand_segment_sizes = dense<0> : vector<2xi32>, uniq_name = "_QFEd"} : (i64) -> !llvm.ptr -!LLVMDialect: %[[LLVM_VAR_E:.*]] = llvm.mlir.addressof @_QFEe : !llvm.ptr> -!LLVMDialect: %[[LLVM_VAR_F:.*]] = llvm.mlir.addressof @_QFEf : !llvm.ptr> -!LLVMDialect: {{.*}} = llvm.mlir.constant(1 : i64) : i64 -!LLVMDialect: %[[LLVM_VAR_G:.*]] = llvm.alloca {{.*}} x f32 {bindc_name = "g", in_type = f32, operand_segment_sizes = dense<0> : vector<2xi32>, uniq_name = "_QFEg"} : (i64) -> !llvm.ptr -!LLVMDialect: {{.*}} = llvm.mlir.constant(1 : i64) : i64 -!LLVMDialect: %[[LLVM_VAR_H:.*]] = llvm.alloca {{.*}} x f32 {bindc_name = "h", in_type = f32, operand_segment_sizes = dense<0> : vector<2xi32>, uniq_name = "_QFEh"} : (i64) -> !llvm.ptr -!LLVMDialect: {{.*}} = llvm.mlir.constant(1 : i64) : i64 -!LLVMDialect: %[[LLVM_VAR_X:.*]] = llvm.alloca {{.*}} x i32 {bindc_name = "x", in_type = i32, operand_segment_sizes = dense<0> : vector<2xi32>, uniq_name = "_QFEx"} : (i64) -> !llvm.ptr -!LLVMDialect: {{.*}} = llvm.mlir.constant(1 : i64) : i64 -!LLVMDialect: %[[LLVM_VAR_Y:.*]] = llvm.alloca {{.*}} x i32 {bindc_name = "y", in_type = i32, operand_segment_sizes = dense<0> : vector<2xi32>, uniq_name = "_QFEy"} : (i64) -> !llvm.ptr -!LLVMDialect: omp.atomic.read %[[LLVM_VAR_X]] = %[[LLVM_VAR_Y]] memory_order(acquire) hint(uncontended) : !llvm.ptr -!LLVMDialect: omp.atomic.read %[[LLVM_VAR_A]] = %[[LLVM_VAR_B]] memory_order(relaxed) hint(none) : !llvm.ptr> -!LLVMDialect: omp.atomic.read %[[LLVM_VAR_C]] = %[[LLVM_VAR_D]] memory_order(seq_cst) hint(contended) : !llvm.ptr -!LLVMDialect: omp.atomic.read %[[LLVM_VAR_E]] = %[[LLVM_VAR_F]] hint(speculative) : !llvm.ptr> -!LLVMDialect: omp.atomic.read %[[LLVM_VAR_G]] = %[[LLVM_VAR_H]] hint(nonspeculative) : !llvm.ptr -!LLVMDialect: omp.atomic.read %[[LLVM_VAR_G]] = %[[LLVM_VAR_H]] : !llvm.ptr -!LLVMDialect: llvm.return -!LLVMDialect: } - -program OmpAtomic - - use omp_lib - integer :: x, y - character :: a, b - logical :: c, d - character(8) :: e, f - real g, h - !$omp atomic acquire read hint(omp_sync_hint_uncontended) - x = y - !$omp atomic relaxed read hint(omp_sync_hint_none) - a = b - !$omp atomic read seq_cst hint(omp_sync_hint_contended) - c = d - !$omp atomic read hint(omp_sync_hint_speculative) - e = f - !$omp atomic read hint(omp_sync_hint_nonspeculative) - g = h - !$omp atomic read - g = h -end program OmpAtomic diff --git a/flang/test/Lower/OpenMP/atomic02.f90 b/flang/test/Lower/OpenMP/atomic02.f90 deleted file mode 100644 index f5ef943..0000000 --- a/flang/test/Lower/OpenMP/atomic02.f90 +++ /dev/null @@ -1,64 +0,0 @@ -! RUN: bbc -fopenmp -emit-fir %s -o - | \ -! RUN: FileCheck %s --check-prefix=FIRDialect -! RUN: bbc -fopenmp %s -o - | fir-opt --fir-to-llvm-ir | \ -! RUN: FileCheck %s --check-prefix=LLVMDialect - -! This test checks the lowering of atomic write - -!FIRDialect: func @_QQmain() { -!FIRDialect: %[[VAR_X:.*]] = fir.alloca i32 {bindc_name = "x", uniq_name = "_QFEx"} -!FIRDialect: %[[VAR_Y:.*]] = fir.alloca i32 {bindc_name = "y", uniq_name = "_QFEy"} -!FIRDialect: %[[VAR_Z:.*]] = fir.alloca i32 {bindc_name = "z", uniq_name = "_QFEz"} -!FIRDialect: %[[CONST_44:.*]] = arith.constant 44 : i32 -!FIRDialect: omp.atomic.write %[[VAR_X]] = %[[CONST_44]] hint(uncontended) memory_order(seq_cst) : !fir.ref, i32 -!FIRDialect: %[[CONST_7:.*]] = arith.constant 7 : i32 -!FIRDialect: {{.*}} = fir.load %[[VAR_Y]] : !fir.ref -!FIRDialect: %[[VAR_7y:.*]] = arith.muli %[[CONST_7]], {{.*}} : i32 -!FIRDialect: omp.atomic.write %[[VAR_X]] = %[[VAR_7y]] memory_order(relaxed) : !fir.ref, i32 -!FIRDialect: %[[CONST_10:.*]] = arith.constant 10 : i32 -!FIRDialect: {{.*}} = fir.load %[[VAR_X]] : !fir.ref -!FIRDialect: {{.*}} = arith.muli %[[CONST_10]], {{.*}} : i32 -!FIRDialect: {{.*}} = fir.load %[[VAR_Z]] : !fir.ref -!FIRDialect: %[[CONST_2:.*]] = arith.constant 2 : i32 -!FIRDialect: {{.*}} = arith.divsi {{.*}}, %[[CONST_2]] : i32 -!FIRDialect: {{.*}} = arith.addi {{.*}}, {{.*}} : i32 -!FIRDialect: omp.atomic.write %[[VAR_Y]] = {{.*}} hint(speculative) memory_order(release) : !fir.ref, i32 -!FIRDialect: return -!FIRDialect: } - -!LLVMDialect: llvm.func @_QQmain() { -!LLVMDialect: %[[LLVM_VAR_2:.*]] = llvm.mlir.constant(2 : i32) : i32 -!LLVMDialect: %[[LLVM_VAR_10:.*]] = llvm.mlir.constant(10 : i32) : i32 -!LLVMDialect: %[[LLVM_VAR_7:.*]] = llvm.mlir.constant(7 : i32) : i32 -!LLVMDialect: %[[LLVM_VAR_44:.*]] = llvm.mlir.constant(44 : i32) : i32 -!LLVMDialect: %[[LLVM_VAR_1:.*]] = llvm.mlir.constant(1 : i64) : i64 -!LLVMDialect: %[[LLVM_VAR_X:.*]] = llvm.alloca {{.*}} x i32 {bindc_name = "x", in_type = i32, operand_segment_sizes = dense<0> : vector<2xi32>, uniq_name = "_QFEx"} : (i64) -> !llvm.ptr -!LLVMDialect: %[[LLVM_VAR_1_SECOND:.*]] = llvm.mlir.constant(1 : i64) : i64 -!LLVMDialect: %[[LLVM_VAR_Y:.*]] = llvm.alloca {{.*}} x i32 {bindc_name = "y", in_type = i32, operand_segment_sizes = dense<0> : vector<2xi32>, uniq_name = "_QFEy"} : (i64) -> !llvm.ptr -!LLVMDialect: %[[LLVM_VAR_1_THIRD:.*]] = llvm.mlir.constant(1 : i64) : i64 -!LLVMDialect: %[[LLVM_VAR_Z:.*]] = llvm.alloca {{.*}} x i32 {bindc_name = "z", in_type = i32, operand_segment_sizes = dense<0> : vector<2xi32>, uniq_name = "_QFEz"} : (i64) -> !llvm.ptr -!LLVMDialect: omp.atomic.write %[[LLVM_VAR_X]] = %[[LLVM_VAR_44]] hint(uncontended) memory_order(seq_cst) : !llvm.ptr, i32 -!LLVMDialect: {{.*}} = llvm.load %[[LLVM_VAR_Y]] : !llvm.ptr -!LLVMDialect: %[[LLVM_VAR_MUL_RESULT:.*]] = llvm.mul {{.*}}, %[[LLVM_VAR_7]] : i32 -!LLVMDialect: omp.atomic.write %[[LLVM_VAR_X]] = %[[LLVM_VAR_MUL_RESULT]] memory_order(relaxed) : !llvm.ptr, i32 -!LLVMDialect: {{.*}} = llvm.load %[[LLVM_VAR_X]] : !llvm.ptr -!LLVMDialect: {{.*}} = llvm.mul {{.*}}, %[[LLVM_VAR_10]] : i32 -!LLVMDialect: {{.*}} = llvm.load %[[LLVM_VAR_Z]] : !llvm.ptr -!LLVMDialect: {{.*}} = llvm.sdiv {{.*}}, %[[LLVM_VAR_2]] : i32 -!LLVMDialect: {{.*}} = llvm.add {{.*}} : i32 -!LLVMDialect: omp.atomic.write %[[LLVM_VAR_Y]] = {{.*}} hint(speculative) memory_order(release) : !llvm.ptr, i32 -!LLVMDialect: llvm.return -!LLVMDialect: } - -program OmpAtomicWrite - use omp_lib - integer :: x, y, z - !$omp atomic seq_cst write hint(omp_sync_hint_uncontended) - x = 8*4 + 12 - - !$omp atomic write relaxed - x = 7 * y - - !$omp atomic write release hint(omp_sync_hint_speculative) - y = 10*x + z/2 -end program OmpAtomicWrite