[flang][OpenMP] Add fortran test with basic target region

[jsjodin]

Summary

This patch adds a test that uses a target region to set a scalar value. It also adds rules in lit.cfg to handle Fortran testing.

[jdoerfert]

openmp/libomptarget/test/offloading/fortran/basic_target_region.f90

3

I believe you need unsupported here too.
This will only check we have the AMD backend, not that we might want to offload to NVIDIA or the host.

[jsjodin]

Added UNSUPPORTED targets and ignored commands rules.

[jsjodin]

I added unsupported for the other targets.

[elmcdonough]

openmp/libomptarget/test/offloading/fortran/basic_target_region.f90

3

Do you reckon this applies to basic_array.c as well?

[jdoerfert]

LG

openmp/libomptarget/test/offloading/fortran/basic_target_region.f90

3

yes.

openmp/libomptarget/test/lit.cfg

for v in possible_true_values:
         if env == v:
             return True
     return False
 
 # name: The name of this test suite.
 config.name = 'libomptarget :: ' + config.libomptarget_current_target
 
 # suffixes: A list of file extensions to treat as test files.
-config.suffixes = ['.c', '.cpp', '.cc']
+config.suffixes = ['.c', '.cpp', '.cc', '.f90']
+
+# excludes: A list of directories to exclude from the testuites.
+config.excludes = ['Inputs']
 
 # test_source_root: The root path where tests are located.
 config.test_source_root = os.path.dirname(__file__)
 
 # test_exec_root: The root object directory where output is placed
 config.test_exec_root = config.libomptarget_obj_root
 
 # test format

 for libomptarget_target in config.libomptarget_all_targets:
     # Is this target in the current system? If so create a compile, run and test
     # command. Otherwise create command that return false.
     if libomptarget_target == config.libomptarget_current_target:
         config.substitutions.append(("%libomptarget-compilexx-run-and-check-generic",
             "%libomptarget-compilexx-run-and-check-" + libomptarget_target))
         config.substitutions.append(("%libomptarget-compile-run-and-check-generic",
             "%libomptarget-compile-run-and-check-" + libomptarget_target))
+        config.substitutions.append(("%libomptarget-compile-fortran-run-and-check-generic",
+            "%libomptarget-compile-fortran-run-and-check-" + libomptarget_target))
         config.substitutions.append(("%libomptarget-compilexx-and-run-generic",
             "%libomptarget-compilexx-and-run-" + libomptarget_target))
         config.substitutions.append(("%libomptarget-compile-and-run-generic",
             "%libomptarget-compile-and-run-" + libomptarget_target))
         config.substitutions.append(("%libomptarget-compilexx-generic",
             "%libomptarget-compilexx-" + libomptarget_target))
         config.substitutions.append(("%libomptarget-compile-generic",
             "%libomptarget-compile-" + libomptarget_target))
+        config.substitutions.append(("%libomptarget-compile-fortran-generic",
+            "%libomptarget-compile-fortran-" + libomptarget_target))
         config.substitutions.append(("%libomptarget-compileoptxx-run-and-check-generic",
             "%libomptarget-compileoptxx-run-and-check-" + libomptarget_target))
         config.substitutions.append(("%libomptarget-compileopt-run-and-check-generic",
             "%libomptarget-compileopt-run-and-check-" + libomptarget_target))
         config.substitutions.append(("%libomptarget-compileoptxx-and-run-generic",
             "%libomptarget-compileoptxx-and-run-" + libomptarget_target))
         config.substitutions.append(("%libomptarget-compileopt-and-run-generic",
             "%libomptarget-compileopt-and-run-" + libomptarget_target))
if libomptarget_target == config.libomptarget_current_target:
         config.substitutions.append(("%libomptarget-compilexx-run-and-check-" + \
             libomptarget_target, \
             "%libomptarget-compilexx-and-run-" + libomptarget_target + \
             " | " + config.libomptarget_filecheck + " %s"))
         config.substitutions.append(("%libomptarget-compile-run-and-check-" + \
             libomptarget_target, \
             "%libomptarget-compile-and-run-" + libomptarget_target + \
             " | " + config.libomptarget_filecheck + " %s"))
+        config.substitutions.append(("%libomptarget-compile-fortran-run-and-check-" + \
+            libomptarget_target, \
+            "%libomptarget-compile-fortran-and-run-" + libomptarget_target + \
+            " | " + config.libomptarget_filecheck + " %s"))
         config.substitutions.append(("%libomptarget-compilexx-and-run-" + \
             libomptarget_target, \
             "%libomptarget-compilexx-" + libomptarget_target + " && " + \
             "%libomptarget-run-" + libomptarget_target))
         config.substitutions.append(("%libomptarget-compile-and-run-" + \
             libomptarget_target, \
             "%libomptarget-compile-" + libomptarget_target + " && " + \
             "%libomptarget-run-" + libomptarget_target))
+        config.substitutions.append(("%libomptarget-compile-fortran-and-run-" + \
+            libomptarget_target, \
+            "%libomptarget-compile-fortran-" + libomptarget_target + " && " + \
+            "%libomptarget-run-" + libomptarget_target))
         config.substitutions.append(("%libomptarget-compilexx-" + \
             libomptarget_target, \
             "%clangxx-" + libomptarget_target + " %s -o %t" + \
             (" -lcgpu" if config.libomptarget_has_libc else "")))
         config.substitutions.append(("%libomptarget-compile-" + \
             libomptarget_target, \
             "%clang-" + libomptarget_target + " %s -o %t" +
             (" -lcgpu" if config.libomptarget_has_libc else "")))
+        config.substitutions.append(("%libomptarget-compile-fortran-" + \
+            libomptarget_target, \
+            "%flang-" + libomptarget_target + " %s -o %t"))
         config.substitutions.append(("%libomptarget-compileoptxx-run-and-check-" + \
             libomptarget_target, \
             "%libomptarget-compileoptxx-and-run-" + libomptarget_target + \
             " | " + config.libomptarget_filecheck + " %s"))
         config.substitutions.append(("%libomptarget-compileopt-run-and-check-" + \
             libomptarget_target, \
             "%libomptarget-compileopt-and-run-" + libomptarget_target + \
             " | " + config.libomptarget_filecheck + " %s"))
if libomptarget_target == config.libomptarget_current_target:
             libomptarget_target, \
             "%not --crash %t"))
         config.substitutions.append(("%clangxx-" + libomptarget_target, \
                                      "%clangxx %openmp_flags %cuda_flags %flags -fopenmp-targets=" +\
                                      remove_suffix_if_present(libomptarget_target)))
         config.substitutions.append(("%clang-" + libomptarget_target, \
                                      "%clang %openmp_flags %cuda_flags %flags -fopenmp-targets=" +\
                                      remove_suffix_if_present(libomptarget_target)))
+        config.substitutions.append(("%flang-" + libomptarget_target, \
+                                     "%flang %openmp_flags %flags -fopenmp-targets=" +\
+                                     remove_suffix_if_present(libomptarget_target)))
         config.substitutions.append(("%fcheck-" + libomptarget_target, \
             config.libomptarget_filecheck + " %s"))
     else:
         config.substitutions.append(("%libomptarget-compile-run-and-check-" + \
             libomptarget_target, \
             "echo ignored-command"))
+        config.substitutions.append(("%libomptarget-compile-fortran-run-and-check-" + \
+            libomptarget_target, \
+            "echo ignored-command"))
         config.substitutions.append(("%libomptarget-compilexx-run-and-check-" + \
             libomptarget_target, \
             "echo ignored-command"))
         config.substitutions.append(("%libomptarget-compile-and-run-" + \
             libomptarget_target, \
             "echo ignored-command"))
+        config.substitutions.append(("%libomptarget-compile-fortran-and-run-" + \
+            libomptarget_target, \
+            "echo ignored-command"))
         config.substitutions.append(("%libomptarget-compilexx-and-run-" + \
             libomptarget_target, \
             "echo ignored-command"))
         config.substitutions.append(("%libomptarget-compilexx-" + \
             libomptarget_target, \
             "echo ignored-command"))
         config.substitutions.append(("%libomptarget-compile-" + \
             libomptarget_target, \
             "echo ignored-command"))
+        config.substitutions.append(("%libomptarget-compile-fortran-" + \
+            libomptarget_target, \
+            "echo ignored-command"))
         config.substitutions.append(("%libomptarget-compileopt-run-and-check-" + \
             libomptarget_target, \
             "echo ignored-command"))
         config.substitutions.append(("%libomptarget-compileoptxx-run-and-check-" + \
             libomptarget_target, \
             "echo ignored-command"))
         config.substitutions.append(("%libomptarget-compileopt-and-run-" + \
             libomptarget_target, \
else:
             libomptarget_target, \
             "echo ignored-command"))
         config.substitutions.append(("%clang-" + libomptarget_target, \
             "echo ignored-command"))
         config.substitutions.append(("%clangxx-" + libomptarget_target, \
             "echo ignored-command"))
         config.substitutions.append(("%fcheck-" + libomptarget_target, \
             "echo ignored-command"))
+        config.substitutions.append(("%flang-" + libomptarget_target, \
+            "echo ignored-command"))
 
 config.substitutions.append(("%clangxx", config.test_cxx_compiler))
 config.substitutions.append(("%clang", config.test_c_compiler))
 
 if config.test_fortran_compiler:
     config.available_features.add('flang')
     config.substitutions.append(("%flang", config.test_fortran_compiler))
 
 config.substitutions.append(("%openmp_flags", config.test_openmp_flags))
 if config.libomptarget_current_target.startswith('nvptx') and config.cuda_path:
     config.substitutions.append(("%cuda_flags", "--cuda-path=" + config.cuda_path))
 else:
     config.substitutions.append(("%cuda_flags", ""))
 config.substitutions.append(("%flags", config.test_flags))
 config.substitutions.append(("%not", config.libomptarget_not))

openmp/libomptarget/test/offloading/fortran/basic_array.c

 // Basic offloading test for function compiled with flang
 // REQUIRES: flang, amdgcn-amd-amdhsa
 
 // RUN: %flang -c -fopenmp -fopenmp-targets=amdgcn-amd-amdhsa \
-// RUN:   %S/basic_array.f90 -o basic_array.o
+// RUN:   %S/../../Inputs/basic_array.f90 -o basic_array.o
 // RUN: %libomptarget-compile-generic basic_array.o
 // RUN: %t | %fcheck-generic
 
 #include <stdio.h>
 #define TEST_ARR_LEN 10
 
 #pragma omp declare target
 void increment_at(int i, int *array);

openmp/libomptarget/test/offloading/fortran/basic_target_region.f90

+! Basic offloading test with a target region
+! REQUIRES: flang, amdgcn-amd-amdhsa
+! UNSUPPORTED: nvptx64-nvidia-cuda
+! UNSUPPORTED: nvptx64-nvidia-cuda-LTO
+! UNSUPPORTED: aarch64-unknown-linux-gnu
+! UNSUPPORTED: aarch64-unknown-linux-gnu-LTO
+! UNSUPPORTED: x86_64-pc-linux-gnu
+! UNSUPPORTED: x86_64-pc-linux-gnu-LTO
+
+! RUN: %libomptarget-compile-fortran-run-and-check-generic
+program main
+  integer :: x;
+  x = 0
+!$omp target map(from:x)
+    x = 5
+!$omp end target
+  print *, "x = ", x
+end program main
+
+! CHECK: x = 5
+