Activated OpenMP 5.0 tests in sollve and cleand up run_sollve.sh.
@@ -29,20 +29,31 @@ thisdir=$(getdname $0)
AOMP_GPU=`$AOMP/bin/mygpu`
export MY_SOLLVE_FLAGS="-fopenmp -fopenmp-targets=amdgcn-amd-amdhsa -Xopenmp-target=amdgcn-amd-amdhsa -march=$AOMP_GPU"
-patchrepo $AOMP_REPOS_TEST/$AOMP_SOLVV_REPO_NAME
cd $AOMP_REPOS_TEST/$AOMP_SOLVV_REPO_NAME
-if [ -d logs ] ; then
- rm logs/*.log
-fi
-if [ -d results_report ] ; then
- rm -rf results_report
-fi
-make clean
+rm -rf results_report45
+rm -rf results_report50
+rm -rf combined-results.txt
+
+make tidy
+
+# Run OpenMP 4.5 Tests
make CC=$AOMP/bin/clang CXX=$AOMP/bin/clang++ FC=$AOMP/bin/flang CFLAGS="-lm $MY_SOLLVE_FLAGS" CXXFLAGS="$MY_SOLLVE_FLAGS" FFLAGS="$MY_SOLLVE_FLAGS" LOG=1 LOG_ALL=1 VERBOSE_TESTS=1 VERBOSE=1 all
+echo "--------------------------- OMP 4.5 Results ---------------------------" >> combined-results.txt
+make report_html
+make report_summary >> combined-results.txt
+
+mv results_report results_report45
+
+# Run OpenMP 5.0 Tests
+export MY_SOLLVE_FLAGS="$MY_SOLLVE_FLAGS -fopenmp-version=50"
+make tidy
+make CC=$AOMP/bin/clang CXX=$AOMP/bin/clang++ FC=$AOMP/bin/flang CFLAGS="-lm $MY_SOLLVE_FLAGS" CXXFLAGS="$MY_SOLLVE_FLAGS" FFLAGS="$MY_SOLLVE_FLAGS" OMP_VERSION=5.0 LOG=1 LOG_ALL=1 VERBOSE_TESTS=1 VERBOSE=1 all
+echo "--------------------------- OMP 5.0 Results ---------------------------" >> combined-results.txt
make report_html
-make report_summary
-removepatch $AOMP_REPOS_TEST/$AOMP_SOLVV_REPO_NAME
+make report_summary >> combined-results.txt
+mv results_report results_report50
+cat combined-results.txt
