updated the command line parser to include a new set of options for the NoC. Also added logic so that the noc setup is only run when the user turns on the noc option in the command line

Author: Srivat97

vpr/src/base/SetupVPR.cpp

@@ -35,6 +35,8 @@ static void SetupPlacerOpts(const t_options& Options,
 static void SetupAnnealSched(const t_options& Options,
                              t_annealing_sched* AnnealSched);
 static void SetupRouterOpts(const t_options& Options, t_router_opts* RouterOpts);
+static void SetupNocOpts(const t_options& Options,
+                            t_noc_opts* NocOpts);
 static void SetupRoutingArch(const t_arch& Arch, t_det_routing_arch* RoutingArch);
 static void SetupTiming(const t_options& Options, const bool TimingEnabled, t_timing_inf* Timing);
 static void SetupSwitches(const t_arch& Arch,
@@ -64,6 +66,7 @@ void SetupVPR(const t_options* Options,
               t_annealing_sched* AnnealSched,
               t_router_opts* RouterOpts,
               t_analysis_opts* AnalysisOpts,
+              t_noc_opts* NocOpts,
               t_det_routing_arch* RoutingArch,
               std::vector<t_lb_type_rr_node>** PackerRRGraphs,
               std::vector<t_segment_inf>& Segments,
@@ -107,6 +110,7 @@ void SetupVPR(const t_options* Options,
     SetupRouterOpts(*Options, RouterOpts);
     SetupAnalysisOpts(*Options, *AnalysisOpts);
     SetupPowerOpts(*Options, PowerOpts, Arch);
+    SetupNocOpts(*Options, NocOpts);
 
     if (readArchFile == true) {
         vtr::ScopedStartFinishTimer t("Loading Architecture Description");
@@ -644,6 +648,14 @@ static void SetupPowerOpts(const t_options& Options, t_power_opts* power_opts, t
     }
 }
 
+static void SetupNocOpts(const t_options& Options, t_noc_opts* NocOpts) {
+
+    // assign the noc specific options from the command line
+    NocOpts->noc = Options.noc;
+
+    return;
+}
+
 static int find_ipin_cblock_switch_index(const t_arch& Arch) {
     int ipin_cblock_switch_index = UNDEFINED;
     for (int i = 0; i < Arch.num_switches; ++i) {

vpr/src/base/SetupVPR.h

@@ -19,6 +19,7 @@ void SetupVPR(const t_options* Options,
               t_annealing_sched* AnnealSched,
               t_router_opts* RouterOpts,
               t_analysis_opts* AnalysisOpts,
+              t_noc_opts* NocOpts,
               t_det_routing_arch* RoutingArch,
               std::vector<t_lb_type_rr_node>** PackerRRGraphs,
               std::vector<t_segment_inf>& Segments,

vpr/src/base/read_options.cpp

@@ -2485,21 +2485,14 @@ argparse::ArgumentParser create_arg_parser(std::string prog_name, t_options& arg
 
     auto& noc_grp = parser.add_argument_group("noc options");
 
-    noc_grp.add_argument<bool, ParseOnOff>(args.include_noc, "--include_noc")
+    noc_grp.add_argument<bool, ParseOnOff>(args.noc, "--noc")
         .help(
             "Enables a NoC-driven placer that optimizes the placement of routers on the NoC."
             "Also enables an option in the graphical display that can be used to display the NoC on the FPGA."
             "This should be on only when the FPGA device contains a NoC and the provided netlist connects to the NoC.")
         .default_value("off")
         .show_in(argparse::ShowIn::HELP_ONLY);
 
-    noc_grp.add_argument(args.noc_router_tile_name, "--noc_router_tile_name")
-        .help(
-            "The name used when describing the NoC router tiles in the FPGA architecture description."
-            "This needs to be provided if --include_noc is used.")
-        .default_value("")
-        .show_in(argparse::ShowIn::HELP_ONLY);
-
     return parser;
 }
 

vpr/src/base/read_options.h

@@ -134,7 +134,7 @@ struct t_options {
     argparse::ArgValue<int> place_constraint_expand;
     argparse::ArgValue<bool> place_constraint_subtile;
     // NoC-driven placement
-    argparse::ArgValue<bool> include_noc;
+    argparse::ArgValue<bool> noc;
     argparse::ArgValue<std::string> noc_router_tile_name;
 
     /* Timing-driven placement options only */

vpr/src/base/vpr_api.cpp

@@ -289,6 +289,7 @@ void vpr_init_with_options(const t_options* options, t_vpr_setup* vpr_setup, t_a
              &vpr_setup->AnnealSched,
              &vpr_setup->RouterOpts,
              &vpr_setup->AnalysisOpts,
+             &vpr_setup->NocOpts,
              &vpr_setup->RoutingArch,
              &vpr_setup->PackerRRGraph,
              vpr_setup->Segments,
@@ -404,6 +405,8 @@ void vpr_create_device(t_vpr_setup& vpr_setup, const t_arch& arch) {
 
     vpr_setup_clock_networks(vpr_setup, arch);
 
+    vpr_setup_noc(vpr_setup, arch);
+
     if (vpr_setup.PlacerOpts.place_chan_width != NO_FIXED_CHANNEL_WIDTH) {
         vpr_create_rr_graph(vpr_setup, arch, vpr_setup.PlacerOpts.place_chan_width);
     }
@@ -501,9 +504,9 @@ void vpr_setup_clock_networks(t_vpr_setup& vpr_setup, const t_arch& Arch) {
 void vpr_setup_noc(const t_vpr_setup& vpr_setup, const t_arch& arch)
 {
     // check if the user provided the option to model the noc
-    if (vpr_setup.include_noc == true)
+    if (vpr_setup.NocOpts.noc == true)
     {
-        setup_noc(arch, vpr_setup.noc_router_tile_name);
+        setup_noc(arch);
     }
 }
 
@@ -1149,6 +1152,7 @@ void vpr_setup_vpr(t_options* Options,
                    t_annealing_sched* AnnealSched,
                    t_router_opts* RouterOpts,
                    t_analysis_opts* AnalysisOpts,
+                   t_noc_opts* NocOpts,
                    t_det_routing_arch* RoutingArch,
                    std::vector<t_lb_type_rr_node>** PackerRRGraph,
                    std::vector<t_segment_inf>& Segments,
@@ -1172,6 +1176,7 @@ void vpr_setup_vpr(t_options* Options,
              AnnealSched,
              RouterOpts,
              AnalysisOpts,
+             NocOpts,
              RoutingArch,
              PackerRRGraph,
              Segments,

vpr/src/base/vpr_api.h

@@ -157,6 +157,7 @@ void vpr_setup_vpr(t_options* Options,
                    t_annealing_sched* AnnealSched,
                    t_router_opts* RouterOpts,
                    t_analysis_opts* AnalysisOpts,
+                   t_noc_opts* NocOpts,
                    t_det_routing_arch* RoutingArch,
                    std::vector<t_lb_type_rr_node>** PackerRRGraph,
                    std::vector<t_segment_inf>& Segments,

vpr/src/base/vpr_types.h

@@ -1296,7 +1296,7 @@ struct t_analysis_opts {
 };
 
 struct t_noc_opts {
-    bool include_noc;                   ///<options to model the noc within the FPGA device
+    bool noc;                   ///<options to model the noc within the FPGA device
     std::string noc_router_tile_name;   ///<name of the router tile located in the FPGA
 };