Free-agent thread

Makefile

@@ -313,7 +313,14 @@ $(CURDIR)/tests/4.5/application_kernels/qmcpack_target_static_lib.c.o: $(CURDIR)
 %.c.run: $(OBJS_C)
 	$(call log_section_header,"RUN",$(SYSTEM),$(@:.run=),$(LOG_NOTE),$(OMP_VERSION),$(notdir $(@:.run=.log)))
 	@echo -e $(TXTGRN)"\n\n" running: $@ $(TXTNOC) $(if $(LOG), ${RECORD}$(notdir $(@:.run=.log)))
+
 # If .../test_<envname>_env_<value>...
+	$(if $(findstring _THREADS_RESERVE,$@), \
+  		-$(call loadModules,$(C_COMPILER_MODULE)) \
+   			$(BSRUN)$(RUN_TEST) --env OMP_THREAD_LIMIT 16 \
+				--env OMP_THREADS_RESERVE "structured(5)$(comma)free_agent(2)" \
+     			$(@:.run=.o) $(VERBOSE) $(if $(LOG),$(RECORD)$(notdir $(@:.run=.log)) \
+     		&& echo "PASS" > $(LOGTEMPFILE) || echo "FAIL" > $(LOGTEMPFILE)), \
 	$(if $(findstring _env_,$@), \
 	  -$(call loadModules,$(C_COMPILER_MODULE)) \
 		 $(BSRUN)$(RUN_TEST) --env \
@@ -325,10 +332,11 @@ $(CURDIR)/tests/4.5/application_kernels/qmcpack_target_static_lib.c.o: $(CURDIR)
 	 -$(call loadModules,$(C_COMPILER_MODULE)) $(BSRUN)$(RUN_TEST) $(@:.run=.o) $(VERBOSE) $(if $(LOG),$(RECORD)$(notdir $(@:.run=.log))\
 		 && echo "PASS" > $(LOGTEMPFILE) \
 		 || echo "FAIL" > $(LOGTEMPFILE)) \
-	)
+	))
 	-$(call log_section_footer,"RUN",$(SYSTEM),$$(cat $(LOGTEMPFILE)),$(LOG_NOTE),$(notdir $(@:.run=.log)))
 	-@$(if $(LOG), rm $(LOGTEMPFILE))
 
+
 # run c++ app rule
 %.cpp.run: $(OBJS_CPP)
 	$(call log_section_header,"RUN",$(SYSTEM),$(@:.run=),$(LOG_NOTE),$(OMP_VERSION),$(notdir $(@:.run=.log)))

tests/6.0/task/test_task_threadset_THREADS_RESERVE.c

@@ -0,0 +1,96 @@
+//--------------test_task_threadset.c-----------------------------------------//
+// OpenMP API Version 6.0 November 2024
+// Pg. 901, line 30
+// ***********
+// DIRECTIVE:task
+// CLAUSE:threadset
+// ***********
+// This test checks the functionality of the threadset clause with the task
+// directive. The example referenced here is "5.10 Free Agent Threads" which is
+// taken from the 6.0 examples document. It checks if the task is executed by a
+// free-agent thread when threadset(omp_pool) is used, and that the result of
+// the Fibonacci calculation is correct when both omp_pool and omp_team is used.
+//----------------------------------------------------------------------------//
+
+#include "ompvv.h"
+#include <omp.h>
+
+// not too large
+#define N 5
+
+int count = 0;
+
+int fib_seq(int n) {
+  if (n < 2)
+    return n;
+  return fib_seq(n - 1) + fib_seq(n - 2);
+}
+
+int fib(int n, int use_pool) {
+  int i, j;
+
+  if (use_pool) {
+    if (omp_is_free_agent()) {
+      #pragma omp atomic
+      count++;
+    }
+  }
+  if (n < 2)
+    return n;
+  if (use_pool) {
+    #pragma omp task shared(i) threadset(omp_pool)
+    i = fib(n - 1, use_pool);
+    #pragma omp task shared(j) threadset(omp_pool)
+    j = fib(n - 2, use_pool);
+    #pragma omp taskwait
+  } else {
+    #pragma omp task shared(i) threadset(omp_team)
+    i = fib(n - 1, use_pool);
+    #pragma omp task shared(j) threadset(omp_team)
+    j = fib(n - 2, use_pool);
+    #pragma omp taskwait
+  }
+
+  return (i + j);
+}
+
+int task_work(int n, int use_pool) {
+  int errors = 0;
+  count = 0;
+  int result;
+
+  omp_set_num_threads(OMPVV_NUM_THREADS_HOST);
+  #pragma omp parallel
+  #pragma omp single
+  {
+    result = fib(n, use_pool);
+  }
+  if (use_pool) {
+    OMPVV_WARNING_IF(
+        count == 0,
+        "no free-agent threads in region"); // count should be greater than 0 if
+                                            // a free-agent thread executed the
+                                            // task
+  }
+  OMPVV_TEST_AND_SET(errors, result != fib_seq(n));
+  return errors;
+}
+
+int test_task_threadset() {
+  int errors = 0;
+  int n = N;
+
+  // Test task with threadset(omp_pool)
+  errors += task_work(n, 1);
+
+  // Test task with threadset omp_team
+  errors += task_work(n, 0);
+
+  return errors;
+}
+
+int main() {
+  int errors = 0;
+  OMPVV_TEST_AND_SET(errors, test_task_threadset() != 0);
+  OMPVV_REPORT_AND_RETURN(errors);
+}