[FLOW]: Avoiding Odin's xml config file to be considered as arch file

Signed-off-by: Seyed Alireza Damghani <[email protected]>

Author: sdamghan

ODIN_II/.gitignore

@@ -7,6 +7,7 @@ regression_test/latest
 /*.dot
 /*.do
 /*.xml
+/*.oxml
 /*_input
 /*_output
 /*_vectors

ODIN_II/SRC/include/read_xml_config_file.h renamed to ODIN_II/SRC/include/read_oxml_config_file.h

@@ -23,8 +23,8 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#ifndef READ_XML_CONFIG_FILE_H
-#define READ_XML_CONFIG_FILE_H
+#ifndef READ_OXML_CONFIG_FILE_H
+#define READ_OXML_CONFIG_FILE_H
 
 #include "odin_types.h"
 

ODIN_II/SRC/odin_ii.cpp

@@ -41,7 +41,7 @@
 #include "parse_making_ast.h"
 #include "netlist_create_from_ast.h"
 #include "ast_util.h"
-#include "read_xml_config_file.h"
+#include "read_oxml_config_file.h"
 #include "read_xml_arch_file.h"
 #include "partial_map.h"
 #include "multipliers.h"
@@ -382,7 +382,7 @@ void get_options(int argc, char** argv) {
 
     input_grp.add_argument(global_args.config_file, "-c")
         .help("Configuration file")
-        .metavar("XML_CONFIGURATION_FILE");
+        .metavar("OXML_CONFIGURATION_FILE");
 
     input_grp.add_argument(global_args.verilog_files, "-V")
         .help("list of Verilog HDL file")

ODIN_II/SRC/read_xml_config_file.cpp renamed to ODIN_II/SRC/read_oxml_config_file.cpp

@@ -26,7 +26,7 @@
 #include <stdarg.h>
 #include "odin_types.h"
 #include "odin_globals.h"
-#include "read_xml_config_file.h"
+#include "read_oxml_config_file.h"
 #include "read_xml_util.h"
 #include "pugixml.hpp"
 #include "pugixml_util.hpp"
@@ -48,7 +48,7 @@ extern HardSoftLogicMixer* mixer;
 
 /*-------------------------------------------------------------------------
  * (function: read_config_file)
- * This reads an XML config file that specifies what we will do in the tool.
+ * This reads an Odin XML config file that specifies what we will do in the tool.
  *
  * See config_t in types.h to see the data structures used in this read.
  *-----------------------------------------------------------------------*/
@@ -89,7 +89,7 @@ void read_config_file(const char* file_name) {
         return;
     }
 
-    /* Release the full XML tree */
+    /* Release the full Odin XML tree */
     return;
 }
 

ODIN_II/regression_test/benchmark/task/mixing_optimization/config_file_half/config_file_half.xml renamed to ODIN_II/regression_test/benchmark/task/mixing_optimization/config_file_half/config_file_half.oxml

@@ -26,8 +26,8 @@ circuit_list_add=micro/multiply_hard_block.v
 # complex mutliplication
 circuit_list_add=micro/bm_match[012345]_str_arch.v
 
-synthesis_params= -c regression_test/benchmark/task/mixing_optimization/config_file_half/config_file_half.xml
-simulation_params= -c regression_test/benchmark/task/mixing_optimization/config_file_half/config_file_half.xml
+synthesis_params= -c regression_test/benchmark/task/mixing_optimization/config_file_half/config_file_half.oxml
+simulation_params= -c regression_test/benchmark/task/mixing_optimization/config_file_half/config_file_half.oxml
 
 synthesis_parse_file=regression_test/parse_result/conf/synth.toml
 simulation_parse_file=regression_test/parse_result/conf/sim.toml

ODIN_II/regression_test/benchmark/task/mixing_optimization/config_file_half/task.conf

@@ -70,7 +70,7 @@ def patch_logs(values):
         # strip username from the logs
         r"(" + pwd.getpwuid(os.getuid()).pw_name + r")": "",
         # strip path from known file extensions
-        r"([\/]?[a-zA-Z_.\-0-9]*\/)(?=[^\/\s]*(_input|_output|\.xml|\.v|\.vh|\.blif|\.log|\.do|\.dot|_vectors|_activity)[\s\n]+)": "",
+        r"([\/]?[a-zA-Z_.\-0-9]*\/)(?=[^\/\s]*(_input|_output|\.xml|\.oxml|\.v|\.vh|\.blif|\.log|\.do|\.dot|_vectors|_activity)[\s\n]+)": "",
         # bison used to call EOF $end, but switched to end of file since
         r"syntax error, unexpected \$end": r"syntax error, unexpected end of file",
     }

ODIN_II/regression_test/parse_result/conf/hooks.py

@@ -165,7 +165,7 @@ def configOptParse():
     parser = OptionParser(
         usage="odin_config_maker.py [options] [output_path] [base_filename]",
         prog="odin_config_maker.py",
-        description="[output_path] specifies where configuration files will be written. [base_filename] is used to create the appropriate configuration files, [base_filename].soft.xml, [base_filename].hard_mem.xml, [base_filename].hard_mult.xml, [base_filename].hard.xml",
+        description="[output_path] specifies where configuration files will be written. [base_filename] is used to create the appropriate configuration files, [base_filename].soft.oxml, [base_filename].hard_mem.oxml, [base_filename].hard_mult.oxml, [base_filename].hard.oxml",
     )
 
     # Input options

ODIN_II/regression_test/tools/config_basic_arch.xml renamed to ODIN_II/regression_test/tools/config_basic_arch.oxml

@@ -24,9 +24,9 @@ def isVerilog(file):
     return re.search("\.v$", file) != None
 
 
-def isXML(file):
-    """Return true if the file has the .xml extension."""
-    return re.search("\.xml$", file) != None
+def isOXML(file):
+    """Return true if the file has the .oxml extension."""
+    return re.search("\.oxml$", file) != None
 
 
 def isSoft(file):

ODIN_II/regression_test/tools/odin_config_maker.py

@@ -118,7 +118,7 @@
 	{
 		# set up the regex buffer and extract the name without .v extension
 		$_ = $NEXT_FILE;
-		s/\.xml//g;	
+		s/\.oxml//g;	
 		$NAME_WITHOUT_EXTENSION = $_;
 
 		printf("--------------------------------------------------------------\n");

ODIN_II/regression_test/tools/odin_script_util.py

@@ -13,7 +13,7 @@
 
 path = abspath(sys.argv[1]) + "/"
 slog = open(path + "ODIN_success.lst", "w")
-filelist = filter(odin.isXML, os.listdir(path))
+filelist = filter(odin.isOXML, os.listdir(path))
 
 for file in filelist:
     cmd = "../../odin_II.exe -c " + path + file