vtrutil: Move formula parser into vtr namespace

Author: kmurray

libs/libarchfpga/src/parse_switchblocks.cpp

@@ -34,6 +34,9 @@
 
 using pugiutil::ReqOpt;
 
+using vtr::FormulaParser;
+using vtr::t_formula_data;
+
 /**** Function Declarations ****/
 /*---- Functions for Parsing Switchblocks from Architecture ----*/
 

libs/libarchfpga/src/parse_switchblocks.h

@@ -17,6 +17,6 @@ void read_sb_wireconns(const t_arch_switch_inf* switches, int num_switches, pugi
 void check_switchblock(const t_switchblock_inf* sb, const t_arch* arch);
 
 /* returns integer result according to the specified formula and data */
-int get_sb_formula_raw_result(FormulaParser& formula_parser, const char* formula, const t_formula_data& mydata);
+int get_sb_formula_raw_result(vtr::FormulaParser& formula_parser, const char* formula, const vtr::t_formula_data& mydata);
 
 #endif /* PARSE_SWITCHBLOCKS_H */

libs/libvtrutil/src/vtr_expr_eval.cpp

@@ -5,6 +5,8 @@
 #include <string>
 #include <sstream>
 
+namespace vtr {
+
 using std::stack;
 using std::string;
 using std::stringstream;
@@ -696,3 +698,5 @@ bool FormulaParser::is_piecewise_formula(const char* formula) {
     }
     return result;
 }
+
+} //namespace vtr

libs/libvtrutil/src/vtr_expr_eval.h

@@ -11,6 +11,8 @@
 #include "vtr_string_view.h"
 #include "vtr_flat_map.h"
 
+namespace vtr {
+
 /**** Structs ****/
 
 class t_formula_data {
@@ -143,4 +145,5 @@ class FormulaParser {
     std::stack<Formula_Object> op_stack_; /* stack for handling operators and brackets in formula */
 };
 
+} //namespace vtr
 #endif

vpr/src/base/SetupGrid.cpp

@@ -24,6 +24,9 @@
 #include "SetupGrid.h"
 #include "vtr_expr_eval.h"
 
+using vtr::FormulaParser;
+using vtr::t_formula_data;
+
 static DeviceGrid auto_size_device_grid(const std::vector<t_grid_def>& grid_layouts, const std::map<t_logical_block_type_ptr, size_t>& minimum_instance_counts, float maximum_device_utilization);
 static std::vector<t_logical_block_type_ptr> grid_overused_resources(const DeviceGrid& grid, std::map<t_logical_block_type_ptr, size_t> instance_counts);
 static bool grid_satisfies_instance_counts(const DeviceGrid& grid, std::map<t_logical_block_type_ptr, size_t> instance_counts, float maximum_utilization);

vpr/src/base/setup_clocks.cpp

@@ -12,6 +12,9 @@
 #include <iostream>
 #include <sstream>
 
+using vtr::FormulaParser;
+using vtr::t_formula_data;
+
 static MetalLayer get_metal_layer_from_name(
     std::string metal_layer_name,
     std::unordered_map<std::string, t_metal_layer> clock_metal_layers,

vpr/src/route/build_switchblocks.cpp

@@ -142,6 +142,9 @@
 #include "parse_switchblocks.h"
 #include "vtr_expr_eval.h"
 
+using vtr::FormulaParser;
+using vtr::t_formula_data;
+
 /************ Defines ************/
 /* if defined, switch block patterns are loaded by first computing a row of switch blocks and then
  * stamping out the row throughout the FPGA */