From 7913e6cc6ab9765a366d0e337ae8094e8059586c Mon Sep 17 00:00:00 2001
From: tangxifan <tangxifan@gmail.com>
Date: Fri, 15 Sep 2023 17:38:51 -0700
Subject: [PATCH] [lib] update tests and fixed some bugs

---
 libs/libnamemanager/example/example_module_names.xml        | 4 ++--
 .../example/example_module_names_expect_errors.xml          | 6 ++++++
 libs/libnamemanager/src/base/module_name_map.cpp            | 4 ++--
 3 files changed, 10 insertions(+), 4 deletions(-)
 create mode 100644 libs/libnamemanager/example/example_module_names_expect_errors.xml

diff --git a/libs/libnamemanager/example/example_module_names.xml b/libs/libnamemanager/example/example_module_names.xml
index 72534edc1..336eeb9c1 100644
--- a/libs/libnamemanager/example/example_module_names.xml
+++ b/libs/libnamemanager/example/example_module_names.xml
@@ -1,5 +1,5 @@
-<module_mames>
+<module_names>
   <module_name default="tile_0__1_" given="tile_io_bottom"/>
   <module_name default="tile_1__1_" given="tile_clb"/>
   <module_name default="tile_1__0_" given="tile_io_left"/>
-</ports>
+</module_names>
diff --git a/libs/libnamemanager/example/example_module_names_expect_errors.xml b/libs/libnamemanager/example/example_module_names_expect_errors.xml
new file mode 100644
index 000000000..186ce92df
--- /dev/null
+++ b/libs/libnamemanager/example/example_module_names_expect_errors.xml
@@ -0,0 +1,6 @@
+<module_names>
+  <module_name default="tile_0__1_" given="tile_io_bottom"/>
+  <module_name default="tile_1__1_" given="tile_clb"/>
+  <module_name default="tile_1__0_" given="tile_io_left"/>
+  <module_name default="tile_3__0_" given="tile_io_left"/>
+</module_names>
diff --git a/libs/libnamemanager/src/base/module_name_map.cpp b/libs/libnamemanager/src/base/module_name_map.cpp
index 7cceb6506..9fa435ee8 100644
--- a/libs/libnamemanager/src/base/module_name_map.cpp
+++ b/libs/libnamemanager/src/base/module_name_map.cpp
@@ -48,11 +48,11 @@ int ModuleNameMap::set_tag_to_name_pair(const std::string& tag, const std::strin
 	VTR_LOG_ERROR("The customized name '%s' has already been mapped to a built-in name '%s'! Fail to bind it to a new built-in name '%s'\n", name.c_str(), result->second.c_str(), tag.c_str());
     return CMD_EXEC_FATAL_ERROR;
   }
+  /* Clean up */
+  name2tags_.erase(name);
   /* Create double link */
   name2tags_[name] = tag;
   tag2names_[tag] = name;
-  /* Clean up */
-  name2tags_.erase(name);
   return CMD_EXEC_SUCCESS;
 }