[Openmp-commits] [openmp] 8303733 - [OpenMP] Clean-up Fortran tests

[Michael Kruse via Openmp-commits]

Author: Michael Kruse
Date: 2025-10-06T12:16:50+02:00
New Revision: 830373372c6e6776149948dd8d3044f06ce9780f

URL: https://github.com/llvm/llvm-project/commit/830373372c6e6776149948dd8d3044f06ce9780f
DIFF: https://github.com/llvm/llvm-project/commit/830373372c6e6776149948dd8d3044f06ce9780f.diff

LOG: [OpenMP] Clean-up Fortran tests

 * Use "do" for DO loops, there is no "for" in Fortran and it is always
   integer

 * Add -cpp to not rely on file name case

 * Add "implicit none" safety

Added: 
    openmp/runtime/test/transform/tile/do.F90
    openmp/runtime/test/transform/tile/do_2d.f90
    openmp/runtime/test/transform/tile/do_2d_varsizes.f90
    openmp/runtime/test/transform/unroll/heuristic_do.f90

Modified: 
    

Removed: 
    openmp/runtime/test/transform/tile/intfor.F90
    openmp/runtime/test/transform/tile/intfor_2d.f90
    openmp/runtime/test/transform/tile/intfor_2d_varsizes.F90
    openmp/runtime/test/transform/unroll/heuristic_intdo.f90


################################################################################
diff  --git a/openmp/runtime/test/transform/tile/intfor.F90 b/openmp/runtime/test/transform/tile/do.F90
similarity index 68%
rename from openmp/runtime/test/transform/tile/intfor.F90
rename to openmp/runtime/test/transform/tile/do.F90
index 4ca9f14fdae9f..74aa54b4b7b61 100644
--- a/openmp/runtime/test/transform/tile/intfor.F90
+++ b/openmp/runtime/test/transform/tile/do.F90
@@ -2,14 +2,14 @@
 ! It is done 3 times corresponding to every possible fraction of the last
 ! iteration before passing beyond UB.
 
-! RUN: %flang %flags %openmp_flags -fopenmp-version=51 -DUB=16 %s -o %t-ub16.exe
-! RUN: %flang %flags %openmp_flags -fopenmp-version=51 -DUB=17 %s -o %t-ub17.exe
-! RUN: %flang %flags %openmp_flags -fopenmp-version=51 -DUB=18 %s -o %t-ub18.exe
+! RUN: %flang %flags %openmp_flags -fopenmp-version=51 -cpp -DUB=16 %s -o %t-ub16.exe
+! RUN: %flang %flags %openmp_flags -fopenmp-version=51 -cpp -DUB=17 %s -o %t-ub17.exe
+! RUN: %flang %flags %openmp_flags -fopenmp-version=51 -cpp -DUB=18 %s -o %t-ub18.exe
 ! RUN: %t-ub16.exe | FileCheck %s --match-full-lines
 ! RUN: %t-ub17.exe | FileCheck %s --match-full-lines
 ! RUN: %t-ub18.exe | FileCheck %s --match-full-lines
 
-program tile_intfor_1d
+program tile_do_1d
   implicit none
   integer i
   print *, 'do'

diff  --git a/openmp/runtime/test/transform/tile/intfor_2d.f90 b/openmp/runtime/test/transform/tile/do_2d.f90
similarity index 96%
rename from openmp/runtime/test/transform/tile/intfor_2d.f90
rename to openmp/runtime/test/transform/tile/do_2d.f90
index 6bc90c768b8d3..162bed0d0d1e9 100644
--- a/openmp/runtime/test/transform/tile/intfor_2d.f90
+++ b/openmp/runtime/test/transform/tile/do_2d.f90
@@ -4,7 +4,8 @@
 ! RUN: %t.exe | FileCheck %s --match-full-lines
 
 
-program tile_intfor_2d
+program tile_do_2d
+  implicit none
   integer i, j
   print *, 'do'
 

diff  --git a/openmp/runtime/test/transform/tile/intfor_2d_varsizes.F90 b/openmp/runtime/test/transform/tile/do_2d_varsizes.f90
similarity index 96%
rename from openmp/runtime/test/transform/tile/intfor_2d_varsizes.F90
rename to openmp/runtime/test/transform/tile/do_2d_varsizes.f90
index 4cb5adf606dd2..7d60ad019926c 100644
--- a/openmp/runtime/test/transform/tile/intfor_2d_varsizes.F90
+++ b/openmp/runtime/test/transform/tile/do_2d_varsizes.f90
@@ -3,7 +3,8 @@
 ! RUN: %flang %flags %openmp_flags -fopenmp-version=51 %s -o %t.exe
 ! RUN: %t.exe | FileCheck %s --match-full-lines
 
-program tile_intfor_varsizes
+program tile_do_2d_varsizes
+  implicit none
   integer i
 
   call kernel(7,17,3,2)

diff  --git a/openmp/runtime/test/transform/unroll/heuristic_intdo.f90 b/openmp/runtime/test/transform/unroll/heuristic_do.f90
similarity index 90%
rename from openmp/runtime/test/transform/unroll/heuristic_intdo.f90
rename to openmp/runtime/test/transform/unroll/heuristic_do.f90
index d0ef938dd3a8f..c646e5274cce1 100644
--- a/openmp/runtime/test/transform/unroll/heuristic_intdo.f90
+++ b/openmp/runtime/test/transform/unroll/heuristic_do.f90
@@ -4,7 +4,8 @@
 ! RUN: %t.exe | FileCheck %s --match-full-lines
 
 
-program unroll_heuristic
+program unroll_heuristic_do
+  implicit none
   integer :: i
   print *, 'do'