change address type to uint32 and use map size insteadd of mparsing from autodiscovery.

Author: sherry-yuan

include/acl.h

@@ -481,7 +481,7 @@ typedef class acl_device_program_info_t *acl_device_program_info;
 
 // Definition of device global.
 struct acl_device_global_mem_def_t {
-  unsigned int address;
+  uint32_t address;
   uint32_t size;
 };
 

src/acl_auto_configure.cpp

@@ -517,7 +517,6 @@ bool acl_load_device_def_from_str(const std::string &config_str,
   if (result && counters.back() > 0) {
     result =
         read_uint_counters(config_str, curr_pos, num_device_global, counters);
-    devdef.num_device_global = num_device_global;
 
     // read total number of fields in device global
     unsigned int total_fields_device_global = 0;
@@ -538,10 +537,10 @@ bool acl_load_device_def_from_str(const std::string &config_str,
       }
 
       // read device global address
-      unsigned int dev_global_addr = 0; // Default
+      uint32_t dev_global_addr = 0; // Default
       if (result && counters.back() > 0) {
-        result =
-            read_uint_counters(config_str, curr_pos, dev_global_addr, counters);
+        result = read_uint32_counters(config_str, curr_pos, dev_global_addr,
+                                      counters);
       }
       // read device global address size
       uint32_t dev_global_size = 0; // Default

test/acl_auto_configure_test.cpp

@@ -270,7 +270,7 @@ TEST(auto_configure, simple) {
   CHECK_EQUAL(1, (int)m_device_def.autodiscovery_def.accel[0].is_sycl_compile);
 
   // Checks for device global entry.
-  CHECK_EQUAL(2, m_device_def.autodiscovery_def.num_device_global);
+  CHECK_EQUAL(2, m_device_def.autodiscovery_def.device_global_mem_defs.size());
   const auto kernel15_dev_global =
       m_device_def.autodiscovery_def.device_global_mem_defs.find(
           "kernel15_dev_global");