faasm · Shillaker · Feb 10, 2022 · Feb 9, 2022 · Feb 9, 2022 · Feb 10, 2022
diff --git a/clients/cpp b/clients/cpp
diff --git a/src/wavm/openmp.cpp b/src/wavm/openmp.cpp
@@ -424,6 +424,11 @@ WAVM_DEFINE_INTRINSIC_FUNCTION(env,
         nextLevel->setSharedVarOffsets(sharedVarsPtr, nSharedVars);
     }
 
+    if (nextLevel->depth > 1) {
+        SPDLOG_ERROR("Nested OpenMP support removed");
+        throw std::runtime_error("Nested OpenMP support removed");
+    }
+
     // Set up the chained calls
     std::shared_ptr<faabric::BatchExecuteRequest> req =
       faabric::util::batchExecFactory(
@@ -597,8 +602,8 @@ void for_static_init(I32 schedule,
             break;
         }
         default: {
-            throw std::runtime_error(
-              fmt::format("Unimplemented scheduler {}", schedule));
+            SPDLOG_ERROR("Unimplemented OpenMP scheduler {}", schedule);
+            throw std::runtime_error("Unimplemented OpenMP scheduler");
         }
     }
 }

diff --git a/tests/test/faaslet/test_errors.cpp b/tests/test/faaslet/test_errors.cpp
@@ -8,22 +8,6 @@
 using namespace faaslet;
 
 namespace tests {
-faabric::Message execErrorFunction(faabric::Message& call)
-{
-    auto fac = std::make_shared<faaslet::FaasletFactory>();
-    faabric::runner::FaabricMain m(fac);
-    m.startRunner();
-
-    faabric::scheduler::Scheduler& sch = faabric::scheduler::getScheduler();
-    sch.callFunction(call);
-
-    faabric::Message result = sch.getFunctionResult(call.id(), 1);
-
-    m.shutdown();
-
-    return result;
-}
-
 void checkError(const std::string& funcName, const std::string& expectedMsg)
 {
     cleanSystem();

diff --git a/tests/test/wasm/test_openmp.cpp b/tests/test/wasm/test_openmp.cpp
@@ -178,4 +178,29 @@ TEST_CASE_METHOD(OpenMPTestFixture,
 
     execFuncWithPool(msg, false, OMP_TEST_TIMEOUT_MS);
 }
+
+TEST_CASE_METHOD(OpenMPTestFixture,
+                 "Test nested openmp explicitly disabled",
+                 "[wasm][openmp]")
+{
+    faabric::scheduler::Scheduler& sch = faabric::scheduler::getScheduler();
+
+    // Make sure there's definitely enough slots
+    int nSlots = 20;
+    faabric::HostResources res;
+    res.set_slots(nSlots);
+    sch.setThisHostResources(res);
+
+    faabric::Message msg =
+      faabric::util::messageFactory("omp", "nested_parallel");
+    faabric::Message result = execErrorFunction(msg);
+
+    // Get result
+    REQUIRE(result.returnvalue() > 0);
+
+    std::string expectedOutput = fmt::format(
+      "Task {} threw exception. What: OpenMP threads failed", msg.id());
+    const std::string actualOutput = result.outputdata();
+    REQUIRE(actualOutput == expectedOutput);
+}
 }
diff --git a/tests/utils/utils.h b/tests/utils/utils.h
@@ -22,6 +22,8 @@ void execFuncWithPool(faabric::Message& call,
                       bool clean = true,
                       int timeout = 1000);
 
+faabric::Message execErrorFunction(faabric::Message& call);
+
 void executeWithWamrPool(const std::string& user,
                          const std::string& func,
                          int timeout = 1000);

diff --git a/tests/utils/worker_utils.cpp b/tests/utils/worker_utils.cpp
@@ -199,6 +199,22 @@ void doWamrPoolExecution(faabric::Message& msg, int timeout = 1000)
     conf.wasmVm = originalVm;
 }
 
+faabric::Message execErrorFunction(faabric::Message& call)
+{
+    auto fac = std::make_shared<faaslet::FaasletFactory>();
+    faabric::runner::FaabricMain m(fac);
+    m.startRunner();
+
+    faabric::scheduler::Scheduler& sch = faabric::scheduler::getScheduler();
+    sch.callFunction(call);
+
+    faabric::Message result = sch.getFunctionResult(call.id(), 1);
+
+    m.shutdown();
+
+    return result;
+}
+
 void executeWithWamrPool(const std::string& user,
                          const std::string& func,
                          int timeout)
+2 −2		.env
+1 −1		.github/workflows/tests.yml
+1 −1		VERSION
+1 −0		func/demo/CMakeLists.txt
+61 −0		func/demo/random_float.cpp
+1 −0		func/mpi/CMakeLists.txt
+118 −0		func/mpi/migrate.cpp
+2 −0		func/omp/CMakeLists.txt
+57 −0		func/omp/barrier_stress.cpp
+32 −0		func/omp/nested_parallel.cpp
+1 −0		libfaasm/CMakeLists.txt
+4 −0		libfaasm/faasm.imports
+5 −0		libfaasm/faasm/host_interface.h
+15 −0		libfaasm/faasm/migrate.h