update file organization and be ready for SB/CB class

.gitignore

@@ -4,6 +4,9 @@
 # temp files
 .DS_Store
 
+# ctags
+tags
+
 # log files
 **/logs
 *.log

fpga_flow/configs/fpga_spice/k6_N10_sram_tsmc40nm_TT.conf

@@ -1,27 +1,27 @@
 # Standard Configuration Example
 [dir_path]
-script_base = /var/tmp/Presentation_OpenFPGA/OpenFPGA/fpga_flow/scripts/
-benchmark_dir = /var/tmp/Presentation_OpenFPGA/OpenFPGA/fpga_flow/benchmarks/FPGA_SPICE_bench/
-yosys_path = /var/tmp/Presentation_OpenFPGA/OpenFPGA/fpga_flow/../yosys/yosys
-odin2_path = /var/tmp/Presentation_OpenFPGA/OpenFPGA/fpga_flow/not_used_atm/odin2.exe
-cirkit_path = /var/tmp/Presentation_OpenFPGA/OpenFPGA/fpga_flow/not_used_atm/cirkit
-abc_path = /var/tmp/Presentation_OpenFPGA/OpenFPGA/fpga_flow/../yosys/yosys-abc
-abc_mccl_path = /var/tmp/Presentation_OpenFPGA/OpenFPGA/fpga_flow/../abc_with_bb_support/abc
-abc_with_bb_support_path = /var/tmp/Presentation_OpenFPGA/OpenFPGA/fpga_flow/../abc_with_bb_support/abc
-mpack1_path = /var/tmp/Presentation_OpenFPGA/OpenFPGA/fpga_flow/not_used_atm/mpack1
-m2net_path = /var/tmp/Presentation_OpenFPGA/OpenFPGA/fpga_flow/not_used_atm/m2net
-mpack2_path = /var/tmp/Presentation_OpenFPGA/OpenFPGA/fpga_flow/not_used_atm/mpack2
-vpr_path = /var/tmp/Presentation_OpenFPGA/OpenFPGA/fpga_flow/../vpr7_x2p/vpr/vpr
-rpt_dir = /var/tmp/Presentation_OpenFPGA/OpenFPGA/fpga_flow/results
-ace_path = /var/tmp/Presentation_OpenFPGA/OpenFPGA/fpga_flow/../ace2/ace
+script_base = /research/ece/lnis/USERS/tang/github/OpenFPGA/fpga_flow/scripts/
+benchmark_dir = /research/ece/lnis/USERS/tang/github/OpenFPGA/fpga_flow/benchmarks/FPGA_SPICE_bench/
+yosys_path = /research/ece/lnis/USERS/tang/github/OpenFPGA/fpga_flow/../yosys/yosys
+odin2_path = /research/ece/lnis/USERS/tang/github/OpenFPGA/fpga_flow/not_used_atm/odin2.exe
+cirkit_path = /research/ece/lnis/USERS/tang/github/OpenFPGA/fpga_flow/not_used_atm/cirkit
+abc_path = /research/ece/lnis/USERS/tang/github/OpenFPGA/fpga_flow/../yosys/yosys-abc
+abc_mccl_path = /research/ece/lnis/USERS/tang/github/OpenFPGA/fpga_flow/../abc_with_bb_support/abc
+abc_with_bb_support_path = /research/ece/lnis/USERS/tang/github/OpenFPGA/fpga_flow/../abc_with_bb_support/abc
+mpack1_path = /research/ece/lnis/USERS/tang/github/OpenFPGA/fpga_flow/not_used_atm/mpack1
+m2net_path = /research/ece/lnis/USERS/tang/github/OpenFPGA/fpga_flow/not_used_atm/m2net
+mpack2_path = /research/ece/lnis/USERS/tang/github/OpenFPGA/fpga_flow/not_used_atm/mpack2
+vpr_path = /research/ece/lnis/USERS/tang/github/OpenFPGA/fpga_flow/../vpr7_x2p/vpr/vpr
+rpt_dir = /research/ece/lnis/USERS/tang/github/OpenFPGA/fpga_flow/results
+ace_path = /research/ece/lnis/USERS/tang/github/OpenFPGA/fpga_flow/../ace2/ace
 
 [flow_conf]
 flow_type = standard #standard|mpack2|mpack1|vtr_standard|vtr|yosys_vpr
-vpr_arch = /var/tmp/Presentation_OpenFPGA/OpenFPGA/fpga_flow/arch/fpga_spice/k6_N10_sram_tsmc40nm_TT.xml # Use relative path under VPR folder is OK
+vpr_arch = /research/ece/lnis/USERS/tang/github/OpenFPGA/fpga_flow/arch/fpga_spice/k6_N10_sram_tsmc40nm_TT.xml # Use relative path under VPR folder is OK
 mpack1_abc_stdlib = DRLC7T_SiNWFET.genlib # Use relative path under ABC folder is OK
-m2net_conf = /var/tmp/Presentation_OpenFPGA/OpenFPGA/fpga_flow/m2net_conf/m2x2_SiNWFET.conf
+m2net_conf = /research/ece/lnis/USERS/tang/github/OpenFPGA/fpga_flow/m2net_conf/m2x2_SiNWFET.conf
 mpack2_arch = K6_pattern7_I24.arch
-power_tech_xml = /var/tmp/Presentation_OpenFPGA/OpenFPGA/fpga_flow/tech/PTM_45nm/45nm.xml # Use relative path under VPR folder is OK
+power_tech_xml = /research/ece/lnis/USERS/tang/github/OpenFPGA/fpga_flow/tech/PTM_45nm/45nm.xml # Use relative path under VPR folder is OK
 
 [csv_tags]
 mpack1_tags = Global mapping efficiency:|efficiency:|occupancy wo buf:|efficiency wo buf:

vpr7_x2p/vpr/SRC/fpga_x2p/base/fpga_x2p_globals.h

@@ -1,7 +1,7 @@
 #ifndef FPGA_X2P_GLOBALS_H 
 #define FPGA_X2P_GLOBALS_H 
 
-#include "rr_chan.h"
+#include "rr_blocks.h"
 
 /* global parameters for FPGA-SPICE tool suites */
 

vpr7_x2p/vpr/SRC/fpga_x2p/base/fpga_x2p_unique_routing.c

@@ -27,7 +27,7 @@
 /* Include spice support headers*/
 #include "read_xml_spice_util.h"
 #include "linkedlist.h"
-#include "rr_chan.h"
+#include "rr_blocks.h"
 #include "fpga_x2p_types.h"
 #include "fpga_x2p_globals.h"
 #include "fpga_x2p_utils.h"

vpr7_x2p/vpr/SRC/fpga_x2p/base/rr_blocks.cpp

@@ -1,6 +1,6 @@
 #include <cassert>
 
-#include "rr_chan.h"
+#include "rr_blocks.h"
 
 
 /* Member Functions of Class RRChan */