Merge pull request #1569 from georgkrylov/infra_changes_for_mixing

Changes to enable custom ODIN configuration to vtr_flow experiments

Author: vaughnbetz

ODIN_II/SRC/odin_ii.cpp

@@ -572,7 +572,7 @@ void get_options(int argc, char** argv) {
             global_args.verilog_files.value().size() > 0                             //have a verilog input list
         })) {
         parser.print_usage();
-        error_message(PARSE_ARGS, unknown_location, "%s", "Must include only one of either:\n\ta config file(-c)\n\ta blif file(-b)\n\ta verilog file(-V)\n");
+        warning_message(PARSE_ARGS, unknown_location, "%s", "Must include only one of either:\n\ta config file(-c)\n\ta blif file(-b)\n\ta verilog file(-V)\nUnless is used for infrastructure directly\n");
     }
 
     //adjust thread count

ODIN_II/SRC/read_xml_config_file.cpp

@@ -44,6 +44,8 @@ void read_debug_switches(pugi::xml_node a_node, config_t* config, const pugiutil
 void read_optimizations(pugi::xml_node a_node, config_t* config, const pugiutil::loc_data& loc_data);
 void set_default_optimization_settings(config_t* config);
 
+extern HardSoftLogicMixer* mixer;
+
 /*-------------------------------------------------------------------------
  * (function: read_config_file)
  * This reads an XML config file that specifies what we will do in the tool.
@@ -217,6 +219,27 @@ void read_optimizations(pugi::xml_node a_node, config_t* config, const pugiutil:
             config->split_hard_multiplier = 1;
     }
 
+    child = get_single_child(a_node, "mix_soft_hard_blocks", loc_data, OPTIONAL);
+    if (child != NULL) {
+        prop = get_attribute(child, "mults_ratio", loc_data, OPTIONAL).as_string(NULL);
+        if (prop != NULL) {
+            float ratio = atof(prop);
+            if (ratio >= 0.0 && ratio <= 1.0) {
+                delete mixer->_opts[MULTIPLY];
+                mixer->_opts[MULTIPLY] = new MultsOpt(ratio);
+            }
+        }
+
+        prop = get_attribute(child, "exact_mults", loc_data, OPTIONAL).as_string(NULL);
+        if (prop != NULL) {
+            int exact = atoi(prop);
+            if (exact >= 0) {
+                delete mixer->_opts[MULTIPLY];
+                mixer->_opts[MULTIPLY] = new MultsOpt(exact);
+            }
+        }
+    }
+
     child = get_single_child(a_node, "memory", loc_data, OPTIONAL);
     if (child != NULL) {
         prop = get_attribute(child, "split_memory_width", loc_data, OPTIONAL).as_string(NULL);

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

@@ -0,0 +1,15 @@
+	<config>
+		<verilog_files>
+		<!-- Leave empty to be able to test with config-->
+		</verilog_files>
+		<output>
+		<!-- Leave empty to be able to test with config-->
+		</output>
+		<optimizations>
+			<!-- This is where the optimization flags go -->
+			<mix_soft_hard_blocks mults_ratio="0.5"></mix_soft_hard_blocks>
+		</optimizations>
+		<debug_outputs>
+		<!-- Leave empty to be able to test with config-->
+		</debug_outputs>
+	</config>