Move the parse_num_arg() handler table to the class itself since one such instance is needed per class object

Signed-off-by: Sonal Santan <sonal.santan@amd.com>

Author: sonals

src/cpp/common/assembler_state.cpp

@@ -7,9 +7,6 @@
 #include "regex_wrapper.h"
 #include "aiebu/aiebu_error.h"
 
-#include <functional>
-#include <unordered_map>
-
 namespace aiebu {
 
 assembler_state::
@@ -162,59 +159,23 @@ process(bool makeunique)
  * 3. If string is hex number string (start with "0x"): it return decimal equavalent
  * 4. If string is numeric string: it will convert to decimal
  */
-uint32_t assembler_state::parse_num_arg(const std::string& str) {
-  static const std::unordered_map<std::string, std::function<uint32_t(const std::string&)>> handlers = {
-    {"@", [this](const std::string& s) -> uint32_t {
-          //If string start with '@': it can be either pad name or label name
-          auto key = s.substr(1);
-          if (m_scratchpad.find(key) != m_scratchpad.end())
-            return m_scratchpad[key]->get_base() + m_scratchpad[key]->get_offset();
-          if (m_labelmap.find(key) != m_labelmap.end())
-            return m_labelmap[key]->get_pos();
-          throw error(error::error_code::invalid_asm, "Label " + key + " not present in label map\n");
-    }},
-    {"s2mm_", [this](const std::string& s) -> uint32_t { return get_actor(s); }},
-    {"mm2s_", [this](const std::string& s) -> uint32_t { return get_actor(s); }},
-    {"mem_s2mm_", [this](const std::string& s) -> uint32_t { return get_actor(s); }},
-    {"mem_mm2s_", [this](const std::string& s) -> uint32_t { return get_actor(s); }},
-    {"shim_s2mm_", [this](const std::string& s) -> uint32_t { return get_actor(s); }},
-    {"shim_mm2s_", [this](const std::string& s) -> uint32_t { return get_actor(s); }},
-    {"tile_s2mm_", [this](const std::string& s) -> uint32_t { return get_actor(s); }},
-    {"tile_mm2s_", [this](const std::string& s) -> uint32_t { return get_actor(s); }},
-    {"shim_ctrl_mm2s_", [this](const std::string& s) -> uint32_t { return get_actor(s); }}
-  };
-
+uint32_t assembler_state::parse_num_arg(const std::string &str) const {
   // check if its pad/label/actor
   for (const auto& [prefix, handler] : handlers) {
     if (str.rfind(prefix) == 0) {
       return handler(str);
     }
   }
 
-  /*
-  if (str.rfind("tile_") == 0)
-  {
-    // Parse and return perticular col and row 32bit base address eg: tile_0_1
-    constexpr static size_t col_start = 5;
-    constexpr static size_t len_of_underscore = 1;
-    constexpr static size_t row_mask = 0x1F;
-    constexpr static size_t col_mask = 0x7F;
-    constexpr static size_t col_shift = 5;
-    size_t row_start = col_start + len_of_underscore + str.substr(col_start).rfind("_");
-    uint32_t col = std::stoi(str.substr(col_start));
-    uint32_t row = std::stoi(str.substr(row_start));
-    return (((col & col_mask) << col_shift) | (row & row_mask));
-  }
-  */
   static const regex kTileRe{R"(^tile_(\d+)_(\d+)$)"};
   smatch m;
-  if (regex_match(str, m, kTileRe) && (m.size() == 3))
+  if ((str[0] == 't') && regex_match(str, m, kTileRe) && (m.size() == 3))
   {
     constexpr static size_t row_mask = 0x1F;
     constexpr static size_t col_mask = 0x7F;
     constexpr static size_t col_shift = 5;
-    const uint32_t col = std::stoi(m[1].str());
-    const uint32_t row = std::stoi(m[2].str());
+    const uint32_t col = std::stoi(m[1]);
+    const uint32_t row = std::stoi(m[2]);
     return (((col & col_mask) << col_shift) | (row & row_mask));
   }
   else if (str.rfind("0x") == 0)

src/cpp/common/assembler_state.h

@@ -15,6 +15,8 @@
 #include <memory>
 #include <map>
 #include <set>
+#include <functional>
+#include <unordered_map>
 
 namespace aiebu {
 
@@ -145,6 +147,7 @@ class assembler_state : public std::enable_shared_from_this<assembler_state>
   assembler_state(const assembler_state& rhs) = default;
   assembler_state& operator=(const assembler_state& rhs) = delete;
   assembler_state(assembler_state &&s) = default;
+
 public:
   std::shared_ptr<std::map<std::string, std::shared_ptr<isa_op>>> m_isa;
   std::vector<std::shared_ptr<asm_data>>& m_data;
@@ -182,7 +185,7 @@ class assembler_state : public std::enable_shared_from_this<assembler_state>
     return (m_scratchpad.find(label) != m_scratchpad.end());
   }
 
-  uint32_t parse_num_arg(const std::string& str);
+  uint32_t parse_num_arg(const std::string& str) const;
 
   void process(bool makeunique);
 
@@ -246,6 +249,29 @@ class assembler_state : public std::enable_shared_from_this<assembler_state>
   virtual symbol::patch_schema get_shim_dma_patching() const = 0;
   virtual symbol::patch_schema get_control_packet_patching() const = 0;
   virtual ~assembler_state() = default;
+
+private:
+  const std::unordered_map<std::string, std::function<uint32_t(const std::string&)>> handlers = {
+    {"@", [this](const std::string& s) -> uint32_t {
+      //If string start with '@': it can be either pad name or label name
+      auto key = s.substr(1);
+      if (m_scratchpad.find(key) != m_scratchpad.end())
+        return m_scratchpad[key]->get_base() + m_scratchpad[key]->get_offset();
+      if (m_labelmap.find(key) != m_labelmap.end())
+        return m_labelmap[key]->get_pos();
+      throw error(error::error_code::invalid_asm, "Label " + key + " not present in label map\n");
+    }},
+    {"s2mm_", [this](const std::string& s) -> uint32_t { return get_actor(s); }},
+    {"mm2s_", [this](const std::string& s) -> uint32_t { return get_actor(s); }},
+    {"mem_s2mm_", [this](const std::string& s) -> uint32_t { return get_actor(s); }},
+    {"mem_mm2s_", [this](const std::string& s) -> uint32_t { return get_actor(s); }},
+    {"shim_s2mm_", [this](const std::string& s) -> uint32_t { return get_actor(s); }},
+    {"shim_mm2s_", [this](const std::string& s) -> uint32_t { return get_actor(s); }},
+    {"tile_s2mm_", [this](const std::string& s) -> uint32_t { return get_actor(s); }},
+    {"tile_mm2s_", [this](const std::string& s) -> uint32_t { return get_actor(s); }},
+    {"shim_ctrl_mm2s_", [this](const std::string& s) -> uint32_t { return get_actor(s); }}
+  };
+
 };