Auto discovery change

Author: intel-liudean

include/acl.h

@@ -514,23 +514,16 @@ typedef enum {
 
 // Enum values here also need to match the SPIRV spec for device
 // global in the above link for acl_device_global_host_access_t.
-// ACL_DEVICE_GLOBAL_INIT_MODE_TYPE_COUNT is used for validation in
-// autodiscovery string parsing and should remain the last constant
-// in the enum.
-typedef enum {
-  ACL_DEVICE_GLOBAL_INIT_MODE_REPROGRAM,
-  ACL_DEVICE_GLOBAL_INIT_MODE_RESET,
 
-  ACL_DEVICE_GLOBAL_INIT_MODE_TYPE_COUNT
-} acl_device_global_init_mode_t;
 
 // Definition of device global.
 struct acl_device_global_mem_def_t {
   uint64_t address;
   uint32_t size;
   acl_device_global_host_access_t host_access;
-  acl_device_global_init_mode_t init_mode;
+  bool can_skip_programming; // every device global has the same value
   bool implement_in_csr;
+  bool reset_on_reuse; // every device global has the same value
 };
 
 // Part of acl_device_def_t where members are populated from the information

src/acl_auto_configure.cpp

@@ -528,25 +528,26 @@ static bool read_device_global_mem_defs(
           static_cast<unsigned>(ACL_DEVICE_GLOBAL_HOST_ACCESS_TYPE_COUNT))
         result = false;
     }
-    auto init_mode =
-        static_cast<unsigned>(ACL_DEVICE_GLOBAL_INIT_MODE_REPROGRAM);
+    bool can_skip_programming = false;
     if (result && counters.back() > 0) {
-      result = read_uint_counters(config_str, curr_pos, init_mode, counters);
-      if (init_mode >=
-          static_cast<unsigned>(ACL_DEVICE_GLOBAL_INIT_MODE_TYPE_COUNT))
-        result = false;
+      result =
+          read_bool_counters(config_str, curr_pos, can_skip_programming, counters);
     }
     bool implement_in_csr = false;
     if (result && counters.back() > 0) {
       result =
           read_bool_counters(config_str, curr_pos, implement_in_csr, counters);
     }
+    bool reset_on_reuse = false;
+    if (result && counters.back() > 0) {
+      result =
+          read_bool_counters(config_str, curr_pos, reset_on_reuse, counters);
+    }
 
     acl_device_global_mem_def_t dev_global_def = {
         dev_global_addr, dev_global_size,
         static_cast<acl_device_global_host_access_t>(host_access),
-        static_cast<acl_device_global_init_mode_t>(init_mode),
-        implement_in_csr};
+        can_skip_programming, implement_in_csr, reset_on_reuse};
     bool ok =
         device_global_mem_defs.insert({device_global_name, dev_global_def})
             .second;

src/acl_kernel.cpp

@@ -3016,8 +3016,7 @@ bool acl_device_has_reprogram_device_globals(cl_device_id device) {
          std::find_if(device_global_mem_defs.begin(),
                       device_global_mem_defs.end(),
                       [](const auto &name_and_def) {
-                        return name_and_def.second.init_mode ==
-                               ACL_DEVICE_GLOBAL_INIT_MODE_REPROGRAM;
+                        return !name_and_def.second.can_skip_programming;
                       });
 }
 

test/acl_auto_configure_test.cpp

@@ -99,11 +99,11 @@ TEST(auto_configure, simple) {
 
 // Device global autodiscovery entries
 #define NUM_DEV_GLOBAL " 2"
-#define NUM_DEV_GLOBAL_FIELD                                                   \
-  " 6" // contains dev_globa_name, address, size, host_access, init_mode,
-       // implement_in_csr with the above format
-#define DEV_GLOBAL_1 " kernel15_dev_global 0x1000 2048 3 1 0"
-#define DEV_GLOBAL_2 " kernel15_dev_global2 0x800 1024 1 0 1"
+#define NUM_DEV_GLOBAL_FIELD " 7" 
+// The 7 fields are dev_globa_name, address, size, host_access,
+//  can_skip_programming, implement_in_csr, reset_on_reuse
+#define DEV_GLOBAL_1 " kernel15_dev_global 0x1000 2048 3 0 0 0"
+#define DEV_GLOBAL_2 " kernel15_dev_global2 0x800 1024 1 0 1 0"
 
   int parsed;
   std::string err_str;
@@ -286,15 +286,15 @@ TEST(auto_configure, simple) {
   CHECK_EQUAL(2048, kernel15_dev_global->second.size);
   CHECK_EQUAL(ACL_DEVICE_GLOBAL_HOST_ACCESS_NONE,
               kernel15_dev_global->second.host_access);
-  CHECK_EQUAL(ACL_DEVICE_GLOBAL_INIT_MODE_RESET,
-              kernel15_dev_global->second.init_mode);
+  CHECK_EQUAL(false,
+              kernel15_dev_global->second.can_skip_programming);
   CHECK_EQUAL(false, kernel15_dev_global->second.implement_in_csr);
   CHECK_EQUAL(2048, kernel15_dev_global2->second.address);
   CHECK_EQUAL(1024, kernel15_dev_global2->second.size);
   CHECK_EQUAL(ACL_DEVICE_GLOBAL_HOST_ACCESS_WRITE_ONLY,
               kernel15_dev_global2->second.host_access);
-  CHECK_EQUAL(ACL_DEVICE_GLOBAL_INIT_MODE_REPROGRAM,
-              kernel15_dev_global2->second.init_mode);
+  CHECK_EQUAL(false,
+              kernel15_dev_global2->second.can_skip_programming);
   CHECK_EQUAL(true, kernel15_dev_global2->second.implement_in_csr);
 
   // Check a second parsing.

test/acl_kernel_test.cpp

@@ -4350,8 +4350,9 @@ TEST(acl_kernel_reprogram_scheduler, device_global_reprogram) {
        {/* address */ 1024,
         /* size */ 1024,
         /* host_access */ ACL_DEVICE_GLOBAL_HOST_ACCESS_READ_WRITE,
-        /* init_mode */ ACL_DEVICE_GLOBAL_INIT_MODE_REPROGRAM,
-        /* implement_in_csr */ false}});
+        /* can_skip_programming */ false,
+        /* implement_in_csr */ false,
+        /* reset_on_reuse */ false}});
 
   // Initial eager reprogram
   int offset = m_devlog.num_ops;