Support additional sync region and worksharing types.

Tests treat non-empty stderr output as error (can be disabled).

Merge branch 'feature/syncRegionAndWorksharingTypes' into develop

Author: jblueh

.gitlab-ci.yml

@@ -50,4 +50,5 @@ test-output:
     - cd tests
     - export CXX=g++
     - export OUTPUT_INSTRUMENT=yes
+    - export STDERR_OUTPUT_IS_ERROR=no
     - make all

include/opdi/backend/ompt/syncRegionCallbacks.hpp

@@ -66,6 +66,13 @@ namespace opdi {
             logic->onSyncRegion(LogicInterface::SyncRegionKind::Barrier, endpoint);
             break;
           case ompt_sync_region_barrier_implicit:
+        #if _OPENMP >= 202011
+          case ompt_sync_region_barrier_implicit_workshare:
+          case ompt_sync_region_barrier_implicit_parallel:
+        #else  // fallback for compilers with _OPENMP < 202011 that already support fine-grained sync region types
+          case 8:  // ompt_sync_region_barrier_implicit_workshare
+          case 9:  // ompt_sync_region_barrier_implicit_parallel
+        #endif
             logic->onSyncRegion(LogicInterface::SyncRegionKind::BarrierImplicit, endpoint);
             break;
           case ompt_sync_region_barrier_explicit:

include/opdi/backend/ompt/workCallbacks.hpp

@@ -65,6 +65,17 @@ namespace opdi {
 
         switch (wstype) {
           case ompt_work_loop:
+        #if _OPENMP >= 202111
+          case ompt_work_loop_static:
+          case ompt_work_loop_dynamic:
+          case ompt_work_loop_guided:
+          case ompt_work_loop_other:
+        #else  // fallback for compilers with _OPENMP < 202111 that already support fine-grained worksharing types
+          case 10:  // ompt_work_loop_static
+          case 11:  // ompt_work_loop_dynamic
+          case 12:  // ompt_work_loop_guided
+          case 13:  // ompt_work_loop_other
+        #endif
             logic->onWork(LogicInterface::WorksharingKind::Loop, endpoint);
             break;
           case ompt_work_sections:

tests/Makefile

@@ -42,6 +42,9 @@ OUTPUT_INSTRUMENT ?= no
 # possibly set in the environment, enables build from source after preprocessing
 EXPLICIT_PREPROCESSOR ?= no
 
+# possibly set in the environment, toggle whether nonempty output on stderr is treated as an error
+STDERR_OUTPUT_IS_ERROR ?= yes
+
 CXX ?= clang++
 
 FLAGS = $(CXXFLAGS) -std=c++11
@@ -151,7 +154,7 @@ $(patsubst %,run%,$(DRIVERS)):
 	@rm -f testresults; \
 	for test in ${DRIVER_TESTS}; \
 	do \
-		bash run.sh ${DRIVER} $$test $(MODE) $(EXPLICIT_PREPROCESSOR); \
+		bash run.sh ${DRIVER} $$test $(MODE) $(EXPLICIT_PREPROCESSOR) $(STDERR_OUTPUT_IS_ERROR); \
 	done; \
 	if grep -q 1 testresults; then \
 		exit 1; \

tests/run.sh

@@ -28,33 +28,46 @@ TEST=$2
 GENFILE=$BUILD_DIR"/"$DRIVER$TEST".cpp"
 MODE=$3
 EXPLICIT_PREPROCESSOR=$4
+STDERR_OUTPUT_IS_ERROR=$5
 
 LAUNCH_NAME=$DRIVER$TEST
 if [[ "$EXPLICIT_PREPROCESSOR" == "yes" ]];
 then
   LAUNCH_NAME+="Pre";
-fi 
+fi
+
+if [[ "$STDERR_OUTPUT_IS_ERROR" == "yes" ]];
+then
+	ERROR_FILE=$RESULT_DIR/$DRIVER$TEST.err;
+else
+	ERROR_FILE=/dev/null;
+fi
 
 case "$MODE" in
 	"RUN")
-		timeout 5m ./$BUILD_DIR/$LAUNCH_NAME 1> $RESULT_DIR/$DRIVER$TEST.out 2> $RESULT_DIR/$DRIVER$TEST.err;
+		timeout 5m ./$BUILD_DIR/$LAUNCH_NAME 1> $RESULT_DIR/$DRIVER$TEST.out 2> $ERROR_FILE;
 		ret=$?
 		if [[ $ret -ne 0 ]];
 		then
-		  echo -e $DRIVER$TEST "\e[0;31mTIMEOUT or ERROR\e[0m";
-		  cat $RESULT_DIR/$DRIVER$TEST.err;
+			echo -e $DRIVER$TEST "\e[0;31mTIMEOUT or ERROR\e[0m";
+			cat $RESULT_DIR/$DRIVER$TEST.err;
 			echo "1" >> testresults;
 		else
-		  if cmp -s $RESULT_DIR/$DRIVER$TEST.ref $RESULT_DIR/$DRIVER$TEST.out;
-		  then
-			  echo -e $DRIVER$TEST "\e[0;32mOK\e[0m";
-			  echo "0" >> testresults;
-		  else
-			  echo -e $DRIVER$TEST "\e[0;31mFAILED\e[0m";
-			  diff $RESULT_DIR/$DRIVER$TEST.ref $RESULT_DIR/$DRIVER$TEST.out;
-			  echo "1" >> testresults;
-		  fi;
-	  fi;
+			if [[ -s $RESULT_DIR/$DRIVER$TEST.err ]]
+			then
+				echo -e $DRIVER$TEST "\e[0;31mERROR\e[0m";
+				cat $RESULT_DIR/$DRIVER$TEST.err;
+				echo "1" >> testresults;
+			elif cmp -s $RESULT_DIR/$DRIVER$TEST.ref $RESULT_DIR/$DRIVER$TEST.out;
+			then
+				echo -e $DRIVER$TEST "\e[0;32mOK\e[0m";
+				echo "0" >> testresults;
+			else
+				echo -e $DRIVER$TEST "\e[0;31mFAILED\e[0m";
+				diff $RESULT_DIR/$DRIVER$TEST.ref $RESULT_DIR/$DRIVER$TEST.out;
+				echo "1" >> testresults;
+			fi;
+		fi;
 		;;
 	"REF")
 		./$BUILD_DIR/$LAUNCH_NAME > $RESULT_DIR/$DRIVER$TEST.ref