[flang-commits] [flang] [flang][OpenMP] Lower DO, SIMD, and DO SIMD metadirective variants (PR #218555)

[via flang-commits]

================
@@ -0,0 +1,731 @@
+! Test lowering of metadirectives with ordinary loop-associated variants.
+
+! RUN: %flang_fc1 -fopenmp -emit-hlfir -fopenmp-version=52 %s -o - | FileCheck %s
+
+! CHECK: #[[UNROLL:loop_unroll[0-9]*]] =
+! CHECK-SAME: #llvm.loop_unroll<disable = false, count = 4 : i64>
+! CHECK: #[[VECTORIZE:loop_vectorize[0-9]*]] =
+! CHECK-SAME: #llvm.loop_vectorize<disable = false>
+! CHECK: #[[UNROLL_ANNOTATION:loop_annotation[0-9]*]] =
+! CHECK-SAME: #llvm.loop_annotation<unroll = #[[UNROLL]]>
+! CHECK: #[[VECTOR_ANNOTATION:loop_annotation[0-9]*]] =
+! CHECK-SAME: #llvm.loop_annotation<vectorize = #[[VECTORIZE]]>
+
+! CHECK-LABEL: func.func @_QPtest_do(
+! CHECK-NOT:     omp.parallel
+! CHECK:         omp.wsloop private(@_QFtest_doEi_private_i32 {{.*}} ->
+! CHECK-SAME:      %[[DO_PRIVATE:.*]] : !fir.ref<i32>)
+! CHECK:           omp.loop_nest (%[[DO_IV:.*]]) :
+! CHECK:             %[[DO_PRIVATE_DECL:.*]]:2 =
+! CHECK-SAME:          hlfir.declare %[[DO_PRIVATE]]
+! CHECK:             hlfir.assign %[[DO_IV]] to %[[DO_PRIVATE_DECL]]#0
+! CHECK-NOT:         {{^ *}}}
+! CHECK:             %[[DO_ELEMENT:.*]] = hlfir.designate
+! CHECK:             hlfir.assign {{.*}} to %[[DO_ELEMENT]]
+! CHECK:             omp.yield
+! CHECK:         return
+subroutine test_do(n, a)
+  integer :: n, a(n), i
+  !$omp metadirective &
+  !$omp & when(implementation={vendor(llvm)}: do) &
+  !$omp & otherwise(nothing)
+  do i = 1, n
+    a(i) = i
+  end do
+end subroutine
+
+! CHECK-LABEL: func.func @_QPtest_simd(
+! CHECK-NOT:     omp.wsloop
+! CHECK:         omp.simd linear(
+! CHECK:           omp.loop_nest
+! CHECK:             hlfir.assign
+! CHECK:             omp.yield
+! CHECK-NOT:     fir.do_loop
+! CHECK:         fir.load
+! CHECK:         hlfir.assign
+! CHECK:         return
+subroutine test_simd(n, a, after)
+  integer :: n, a(n), after, i
+  !$omp metadirective &
+  !$omp & when(implementation={vendor(llvm)}: simd) &
+  !$omp & otherwise(nothing)
+  do i = 1, n
+    a(i) = i
+  end do
+  after = i
+end subroutine
+
+! CHECK-LABEL: func.func @_QPtest_do_simd(
+! CHECK-NOT:     omp.parallel
+! CHECK:         omp.wsloop
+! CHECK:           omp.simd linear(
+! CHECK:             omp.loop_nest
+! CHECK:               hlfir.assign
+! CHECK:               omp.yield
+! CHECK:         return
+subroutine test_do_simd(n, a)
+  integer :: n, a(n), i
+  !$omp metadirective &
+  !$omp & when(implementation={vendor(llvm)}: do simd) &
+  !$omp & otherwise(nothing)
+  do i = 1, n
+    a(i) = i
+  end do
+end subroutine
+
+! CHECK-LABEL: func.func @_QPtest_begin_do(
+! CHECK:         fir.if {{.*}} {
+! CHECK-NOT:       omp.wsloop
+! CHECK-NOT:       omp.loop_nest
+! CHECK-NOT:       fir.do_loop
+! CHECK:           omp.wsloop private(@_QFtest_begin_doEi_private_i32 {{.*}} ->
+! CHECK-SAME:        %[[BEGIN_DO_PRIVATE:.*]] : !fir.ref<i32>)
+! CHECK-NOT:       omp.wsloop
+! CHECK-NOT:       omp.loop_nest
+! CHECK-NOT:       fir.do_loop
+! CHECK:             omp.loop_nest (%[[BEGIN_DO_IV:.*]]) :
+! CHECK-NOT:       omp.wsloop
+! CHECK-NOT:       omp.loop_nest
+! CHECK-NOT:       fir.do_loop
+! CHECK:               %[[BEGIN_DO_PRIVATE_DECL:.*]]:2 =
+! CHECK-SAME:            hlfir.declare %[[BEGIN_DO_PRIVATE]]
+! CHECK-NOT:       omp.wsloop
+! CHECK-NOT:       omp.loop_nest
+! CHECK-NOT:       fir.do_loop
+! CHECK:               hlfir.assign %[[BEGIN_DO_IV]] to
+! CHECK-SAME:            %[[BEGIN_DO_PRIVATE_DECL]]#0
+! CHECK-NOT:       omp.wsloop
+! CHECK-NOT:       omp.loop_nest
+! CHECK-NOT:       fir.do_loop
+! CHECK-NOT:           {{^ *}}}
+! CHECK:               %[[BEGIN_DO_ELEMENT:.*]] = hlfir.designate
+! CHECK-NOT:       omp.wsloop
+! CHECK-NOT:       omp.loop_nest
+! CHECK-NOT:       fir.do_loop
+! CHECK-NOT:           {{^ *}}}
+! CHECK:               hlfir.assign {{.*}} to %[[BEGIN_DO_ELEMENT]]
+! CHECK-NOT:       omp.wsloop
+! CHECK-NOT:       omp.loop_nest
+! CHECK-NOT:       fir.do_loop
+! CHECK:         } else {
+! CHECK-NOT:       omp.
+! CHECK-NOT:       fir.do_loop
+! CHECK:           fir.do_loop
+! CHECK-NOT:       omp.
+! CHECK-NOT:       fir.do_loop
+! CHECK-NOT:       {{^ *}}}
+! CHECK:             %[[BEGIN_DO_FALLBACK_ELEMENT:.*]] = hlfir.designate
+! CHECK-NOT:       omp.
+! CHECK-NOT:       fir.do_loop
+! CHECK-NOT:       {{^ *}}}
+! CHECK:             hlfir.assign {{.*}} to %[[BEGIN_DO_FALLBACK_ELEMENT]]
+! CHECK-NOT:       omp.
+! CHECK-NOT:       fir.do_loop
+! CHECK:         }
+! CHECK-NOT:     fir.do_loop
+! CHECK-NOT:     omp.
+! CHECK:         return
+subroutine test_begin_do(flag, n, a)
+  logical, intent(in) :: flag
+  integer :: n, a(n), i
+  !$omp begin metadirective &
+  !$omp & when(user={condition(flag)}: do) &
+  !$omp & otherwise(nothing)
+  do i = 1, n
+    a(i) = i
+  end do
+  !$omp end metadirective
+end subroutine
+
+! The following loop must remain available when the PFT is reused for ENTRY.
+! CHECK-LABEL: func.func @_QPtest_standalone_entry_no_directive(
+! CHECK:         fir.if {{.*}} {
+! CHECK-NOT:       omp.wsloop
+! CHECK-NOT:       fir.do_loop
+! CHECK:           omp.wsloop
+! CHECK-NOT:       omp.wsloop
+! CHECK-NOT:       omp.loop_nest
+! CHECK-NOT:       fir.do_loop
+! CHECK:             omp.loop_nest
----------------
MattPD wrote:

`test_standalone_entry_no_directive` and `test_alt_standalone_entry_no_directive` still check only the loop shells. The complete test passes after `a(i) = i` is removed from their associated DO. Neither runtime arm then contains an array body assignment.

Could both ENTRY blocks require `hlfir.designate` followed by `hlfir.assign` inside the selected and fallback loops?

https://github.com/llvm/llvm-project/pull/218555