auto_configure: add attributes of device global to autodiscovery string parsing

Author: sophimao

include/acl.h

@@ -496,10 +496,25 @@ typedef class acl_device_program_info_t *acl_device_program_info;
  */
 #define ACL_MEM_CAPABILITY_P2P (1 << 3)
 
+typedef enum {
+  ACL_DEVICE_GLOBAL_HOST_ACCESS_NONE,
+  ACL_DEVICE_GLOBAL_HOST_ACCESS_READ_ONLY,
+  ACL_DEVICE_GLOBAL_HOST_ACCESS_WRITE_ONLY,
+  ACL_DEVICE_GLOBAL_HOST_ACCESS_READ_WRITE
+} acl_device_global_host_access_t;
+
+typedef enum {
+  ACL_DEVICE_GLOBAL_INIT_MODE_REPROGRAM,
+  ACL_DEVICE_GLOBAL_INIT_MODE_RESET
+} acl_device_global_init_mode_t;
+
 // Definition of device global.
 struct acl_device_global_mem_def_t {
   uint32_t address;
   uint32_t size;
+  acl_device_global_host_access_t host_access;
+  acl_device_global_init_mode_t init_mode;
+  bool implement_in_csr;
 };
 
 // Part of acl_device_def_t where members are populated from the information

src/acl_auto_configure.cpp

@@ -474,8 +474,27 @@ static bool read_device_global_mem_defs(
           read_uint32_counters(config_str, curr_pos, dev_global_size, counters);
     }
 
-    acl_device_global_mem_def_t dev_global_def = {dev_global_addr,
-                                                  dev_global_size};
+    // read device global properties
+    auto host_access = 0U;
+    if (result && counters.back() > 0) {
+      result = read_uint_counters(config_str, curr_pos, host_access, counters);
+    }
+    auto init_mode = 0U;
+    if (result && counters.back() > 0) {
+      result = read_uint_counters(config_str, curr_pos, init_mode, counters);
+    }
+    unsigned int value = 0;
+    bool implement_in_csr = false; // default to false
+    if (result && counters.back() > 0) {
+      result = read_uint_counters(config_str, curr_pos, value, counters);
+    }
+    implement_in_csr = value;
+
+    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};
     bool ok =
         device_global_mem_defs.insert({device_global_name, dev_global_def})
             .second;

test/acl_auto_configure_test.cpp

@@ -36,7 +36,7 @@ TEST(auto_configure, simple) {
 #define VERSIONIDSTRINGIFY(x) #x
 #define VERSIONIDTOSTR(x) VERSIONIDSTRINGIFY(x)
 #define DEVICE_FIELDS " 23"
-#define DEVICE_FIELDS_DEV_GLOBAL " 30"
+#define DEVICE_FIELDS_DEV_GLOBAL " 36"
 #define DEVICE_FIELDS_OLD " 18"
 #define BOARDNAME "de4_gen2x4_swdimm"
 #define BOARDNAME2 "pcie385_a7"
@@ -99,10 +99,11 @@ TEST(auto_configure, simple) {
 
 // Device global autodiscovery entries
 #define NUM_DEV_GLOBAL " 2"
-#define NUM_DEV_GLOBAL_FIELD " 3" // containing dev_globa_name, address, size
-#define DEV_GLOBAL_1                                                           \
-  " kernel15_dev_global 4096 2048" // in format of dev_globa_name, address, size
-#define DEV_GLOBAL_2 " kernel15_dev_global2 2048 1024"
+#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 4096 2048 0 1 0"
+#define DEV_GLOBAL_2 " kernel15_dev_global2 2048 1024 2 0 1"
 
   int parsed;
   std::string err_str;
@@ -283,8 +284,18 @@ TEST(auto_configure, simple) {
         m_device_def.autodiscovery_def.device_global_mem_defs.end());
   CHECK_EQUAL(4096, kernel15_dev_global->second.address);
   CHECK_EQUAL(2048, kernel15_dev_global->second.size);
+  CHECK_EQUAL((acl_device_global_host_access_t)0,
+              kernel15_dev_global->second.host_access);
+  CHECK_EQUAL((acl_device_global_init_mode_t)1,
+              kernel15_dev_global->second.init_mode);
+  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_t)2,
+              kernel15_dev_global2->second.host_access);
+  CHECK_EQUAL((acl_device_global_init_mode_t)0,
+              kernel15_dev_global2->second.init_mode);
+  CHECK_EQUAL(true, kernel15_dev_global2->second.implement_in_csr);
 
   // Check a second parsing.
   // It should allocate a new string for the name.