Revert "[OpenMP][DeviceRTL] Fix the issue that multiple calls to omp_get_wtime is optimized out by mistake"

This reverts commit ad34f1d.

Author: shiltian

llvm/include/llvm/Frontend/OpenMP/OMPKinds.def

@@ -681,7 +681,6 @@ __OMP_RTL_ATTRS(omp_get_partition_num_places, GetterAttrs, AttributeSet(),
                 ParamAttrs())
 __OMP_RTL_ATTRS(omp_get_partition_place_nums, GetterAttrs, AttributeSet(),
                 ParamAttrs())
-__OMP_RTL_ATTRS(omp_get_wtime, GetterAttrs, AttributeSet(), ParamAttrs())
 
 __OMP_RTL_ATTRS(omp_set_num_threads, SetterAttrs, AttributeSet(), ParamAttrs())
 __OMP_RTL_ATTRS(omp_set_dynamic, SetterAttrs, AttributeSet(), ParamAttrs())
@@ -920,7 +919,7 @@ __OMP_RTL_ATTRS(__kmpc_doacross_fini, BarrierAttrs, AttributeSet(),
 
 __OMP_RTL_ATTRS(__kmpc_alloc_shared, AttributeSet(
   EnumAttr(NoUnwind),
-  EnumAttr(NoSync),
+  EnumAttr(NoSync), 
   AllocSizeAttr(0, None)), ReturnPtrAttrs, ParamAttrs())
 __OMP_RTL_ATTRS(__kmpc_free_shared, DeviceAllocAttrs, AttributeSet(),
                 ParamAttrs(NoCaptureAttrs))

openmp/libomptarget/DeviceRTL/src/Misc.cpp

@@ -52,7 +52,7 @@ double getWTick() {
 
 double getWTime() {
   unsigned long long nsecs;
-  asm volatile("mov.u64  %0, %%globaltimer;" : "=l"(nsecs));
+  asm("mov.u64  %0, %%globaltimer;" : "=l"(nsecs));
   return (double)nsecs * getWTick();
 }
 

openmp/libomptarget/test/lit.cfg

@@ -128,7 +128,7 @@ 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",
+        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))
@@ -140,18 +140,6 @@ for libomptarget_target in config.libomptarget_all_targets:
             "%libomptarget-compilexx-" + libomptarget_target))
         config.substitutions.append(("%libomptarget-compile-generic",
             "%libomptarget-compile-" + 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))
-        config.substitutions.append(("%libomptarget-compileoptxx-generic",
-            "%libomptarget-compileoptxx-" + libomptarget_target))
-        config.substitutions.append(("%libomptarget-compileopt-generic",
-            "%libomptarget-compileopt-" + libomptarget_target))
         config.substitutions.append(("%libomptarget-run-generic",
             "%libomptarget-run-" + libomptarget_target))
         config.substitutions.append(("%libomptarget-run-fail-generic",
@@ -186,28 +174,6 @@ for libomptarget_target in config.libomptarget_all_targets:
         config.substitutions.append(("%libomptarget-compile-" + \
             libomptarget_target, \
             "%clang-" + 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"))
-        config.substitutions.append(("%libomptarget-compileoptxx-and-run-" + \
-            libomptarget_target, \
-            "%libomptarget-compileoptxx-" + libomptarget_target + " && " + \
-            "%libomptarget-run-" + libomptarget_target))
-        config.substitutions.append(("%libomptarget-compileopt-and-run-" + \
-            libomptarget_target, \
-            "%libomptarget-compileopt-" + libomptarget_target + " && " + \
-            "%libomptarget-run-" + libomptarget_target))
-        config.substitutions.append(("%libomptarget-compileoptxx-" + \
-            libomptarget_target, \
-            "%clangxx-" + libomptarget_target + " -O3 %s -o %t"))
-        config.substitutions.append(("%libomptarget-compileopt-" + \
-            libomptarget_target, \
-            "%clang-" + libomptarget_target + " -O3 %s -o %t"))
         config.substitutions.append(("%libomptarget-run-" + \
             libomptarget_target, \
             "%t"))
@@ -241,24 +207,6 @@ for libomptarget_target in config.libomptarget_all_targets:
         config.substitutions.append(("%libomptarget-compile-" + \
             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, \
-            "echo ignored-command"))
-        config.substitutions.append(("%libomptarget-compileoptxx-and-run-" + \
-            libomptarget_target, \
-            "echo ignored-command"))
-        config.substitutions.append(("%libomptarget-compileoptxx-" + \
-            libomptarget_target, \
-            "echo ignored-command"))
-        config.substitutions.append(("%libomptarget-compileopt-" + \
-            libomptarget_target, \
-            "echo ignored-command"))
         config.substitutions.append(("%libomptarget-run-" + \
             libomptarget_target, \
             "echo ignored-command"))