globals: make acl_get_offline_device_user_setting return number of simulation device when simulation spec dir shadows CL_CONTEXT_MPSIM_DEVICE_INTELFPGA

Author: sophimao

src/acl_globals.cpp

@@ -108,11 +108,11 @@ const char *acl_get_offline_device_user_setting(int *use_offline_only_ret) {
     }
   } else {
     // Look for multi-process simulator before old simulator.
-    // Check if simulation board spec directory is set, which shadows
-    // CL_CONTEXT_MPSIM_DEVICE_INTELFPGA
-    setting = acl_getenv(ACL_MPSIM_BOARD_SPEC_DIR);
-    if (!setting) {
-      setting = acl_getenv("CL_CONTEXT_MPSIM_DEVICE_INTELFPGA");
+    setting = acl_getenv("CL_CONTEXT_MPSIM_DEVICE_INTELFPGA");
+    // Check if simulation board spec directory is set, which implies
+    // CL_CONTEXT_MPSIM_DEVICE_INTELFPGA if that is not set
+    if (acl_getenv(ACL_MPSIM_BOARD_SPEC_DIR) && (!setting)) {
+      setting = "1"; // Use 1 simulator device by default
     }
     if (setting) {
       use_offline_only = ACL_CONTEXT_MPSIM;