Change autodiscovery format

------------------------------------

Now the autodiscovery format is changed to

num_device_global num_field_in_device_global [(dev_global_name, dev_global_addr, devl_global_size), (dev_global_name, dev_global_addr, devl_global_size), ...]

This is because each device global will have same number of field anyways, so itis not necessary ot keep a number of field for each device global

Author: sherry-yuan

src/acl_auto_configure.cpp

@@ -501,15 +501,15 @@ bool acl_load_device_def_from_str(const std::string &config_str,
         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
+    int total_fields_device_global = 0;
+    if (result) {
+      result = read_int_counters(config_str, curr_pos, total_fields_device_global,
+                                 counters);
+    }
+
     for (auto i = 0U; result && (i < num_device_global);
          i++) { // device_global_memories
-      // read total number of fields in global_memories
-      int total_fields_device_global = 0;
-      if (counters.back() > 0) {
-        result = read_int_counters(config_str, curr_pos,
-                                   total_fields_device_global, counters);
-      }
-
       counters.emplace_back(total_fields_device_global);
 
       // read device global name

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 " 32"
+#define DEVICE_FIELDS_DEV_GLOBAL " 30"
 #define DEVICE_FIELDS_OLD " 18"
 #define BOARDNAME "de4_gen2x4_swdimm"
 #define BOARDNAME2 "pcie385_a7"
@@ -110,7 +110,7 @@ TEST(auto_configure, simple) {
       VERSIONIDTOSTR(ACL_AUTO_CONFIGURE_VERSIONID)
           DEVICE_FIELDS_DEV_GLOBAL RANDOM_HASH
       " " BOARDNAME IS_NOT_BIG_ENDIAN MEM HOSTPIPE KERNEL_ARG_INFO_NONE
-          NUM_DEV_GLOBAL NUM_DEV_GLOBAL_FIELD DEV_GLOBAL_1 NUM_DEV_GLOBAL_FIELD
+          NUM_DEV_GLOBAL NUM_DEV_GLOBAL_FIELD DEV_GLOBAL_1
               DEV_GLOBAL_2
       " 1 82 foo" KERNEL_CRA KERNEL_FAST_LAUNCH_DEPTH KERNEL_PERF_MON
           KERNEL_WORKGROUP_VARIANT KERNEL_WORKITEM_VARIANT