From 24da30e317cdbf4b628141d69b2d17dac5ae3822 Mon Sep 17 00:00:00 2001 From: Nathan Binkert Date: Mon, 11 May 2009 10:38:45 -0700 Subject: ruby: Make ruby #includes use full paths to the files they're including. This basically means changing all #include statements and changing autogenerated code so that it generates the correct paths. Because slicc generates #includes, I had to hard code the include paths to mem/protocol. --- src/mem/ruby/network/orion/NetworkPower.cc | 22 +++++++++++----------- src/mem/ruby/network/orion/SIM_power.hh | 2 +- src/mem/ruby/network/orion/power_arbiter.cc | 14 +++++++------- src/mem/ruby/network/orion/power_arbiter.hh | 2 +- src/mem/ruby/network/orion/power_array.cc | 12 ++++++------ src/mem/ruby/network/orion/power_bus.cc | 12 ++++++------ src/mem/ruby/network/orion/power_crossbar.cc | 12 ++++++------ src/mem/ruby/network/orion/power_ll.cc | 8 ++++---- src/mem/ruby/network/orion/power_router_init.cc | 18 +++++++++--------- src/mem/ruby/network/orion/power_router_init.hh | 6 +++--- src/mem/ruby/network/orion/power_static.cc | 2 +- src/mem/ruby/network/orion/power_static.hh | 2 +- src/mem/ruby/network/orion/power_utils.cc | 4 ++-- 13 files changed, 58 insertions(+), 58 deletions(-) (limited to 'src/mem/ruby/network/orion') diff --git a/src/mem/ruby/network/orion/NetworkPower.cc b/src/mem/ruby/network/orion/NetworkPower.cc index 6e5994071..9d10d5136 100644 --- a/src/mem/ruby/network/orion/NetworkPower.cc +++ b/src/mem/ruby/network/orion/NetworkPower.cc @@ -29,17 +29,17 @@ #include #include -#include "power_router_init.hh" -#include "power_array.hh" -#include "power_crossbar.hh" -#include "power_arbiter.hh" -#include "power_bus.hh" -#include "NetworkPower.hh" -#include "Router_d.hh" -#include "NetworkLink_d.hh" -#include "GarnetNetwork_d.hh" -#include "SIM_port.hh" -#include "parm_technology.hh" +#include "mem/ruby/network/orion/power_router_init.hh" +#include "mem/ruby/network/orion/power_array.hh" +#include "mem/ruby/network/orion/power_crossbar.hh" +#include "mem/ruby/network/orion/power_arbiter.hh" +#include "mem/ruby/network/orion/power_bus.hh" +#include "mem/ruby/network/orion/NetworkPower.hh" +#include "mem/ruby/network/garnet-fixed-pipeline/Router_d.hh" +#include "mem/ruby/network/garnet-fixed-pipeline/NetworkLink_d.hh" +#include "mem/ruby/network/garnet-fixed-pipeline/GarnetNetwork_d.hh" +#include "mem/ruby/network/orion/SIM_port.hh" +#include "mem/ruby/network/orion/parm_technology.hh" /* --------- Static energy calculation functions ------------ */ diff --git a/src/mem/ruby/network/orion/SIM_power.hh b/src/mem/ruby/network/orion/SIM_power.hh index 1f0ddd36c..250e710e3 100644 --- a/src/mem/ruby/network/orion/SIM_power.hh +++ b/src/mem/ruby/network/orion/SIM_power.hh @@ -30,7 +30,7 @@ #define _SIM_POWER_H #include -#include "SIM_power_test.hh" +#include "mem/ruby/network/orion/SIM_power_test.hh" #define SIM_NO_MODEL 0 diff --git a/src/mem/ruby/network/orion/power_arbiter.cc b/src/mem/ruby/network/orion/power_arbiter.cc index ba68fbe1c..d382ebfb2 100644 --- a/src/mem/ruby/network/orion/power_arbiter.cc +++ b/src/mem/ruby/network/orion/power_arbiter.cc @@ -28,13 +28,13 @@ #include -#include "power_arbiter.hh" -#include "power_array.hh" -#include "power_ll.hh" -#include "parm_technology.hh" -#include "SIM_port.hh" -#include "power_static.hh" -#include "power_utils.hh" +#include "mem/ruby/network/orion/power_arbiter.hh" +#include "mem/ruby/network/orion/power_array.hh" +#include "mem/ruby/network/orion/power_ll.hh" +#include "mem/ruby/network/orion/parm_technology.hh" +#include "mem/ruby/network/orion/SIM_port.hh" +#include "mem/ruby/network/orion/power_static.hh" +#include "mem/ruby/network/orion/power_utils.hh" diff --git a/src/mem/ruby/network/orion/power_arbiter.hh b/src/mem/ruby/network/orion/power_arbiter.hh index 671608c2f..f2c3a9eab 100644 --- a/src/mem/ruby/network/orion/power_arbiter.hh +++ b/src/mem/ruby/network/orion/power_arbiter.hh @@ -32,7 +32,7 @@ #ifndef _POWER_ARBITER_H #define _POWER_ARBITER_H -#include "power_array.hh" +#include "mem/ruby/network/orion/power_array.hh" typedef enum { RR_ARBITER =1, diff --git a/src/mem/ruby/network/orion/power_array.cc b/src/mem/ruby/network/orion/power_array.cc index 225f45377..9ac08ffb0 100644 --- a/src/mem/ruby/network/orion/power_array.cc +++ b/src/mem/ruby/network/orion/power_array.cc @@ -29,12 +29,12 @@ #include #include -#include "power_array.hh" -#include "power_ll.hh" -#include "parm_technology.hh" -#include "SIM_port.hh" -#include "power_static.hh" -#include "power_utils.hh" +#include "mem/ruby/network/orion/power_array.hh" +#include "mem/ruby/network/orion/power_ll.hh" +#include "mem/ruby/network/orion/parm_technology.hh" +#include "mem/ruby/network/orion/SIM_port.hh" +#include "mem/ruby/network/orion/power_static.hh" +#include "mem/ruby/network/orion/power_utils.hh" /* local macros */ diff --git a/src/mem/ruby/network/orion/power_bus.cc b/src/mem/ruby/network/orion/power_bus.cc index 032c3c519..7060752a5 100644 --- a/src/mem/ruby/network/orion/power_bus.cc +++ b/src/mem/ruby/network/orion/power_bus.cc @@ -28,12 +28,12 @@ #include -#include "power_bus.hh" -#include "power_ll.hh" -#include "parm_technology.hh" -#include "SIM_port.hh" -#include "power_static.hh" -#include "power_utils.hh" +#include "mem/ruby/network/orion/power_bus.hh" +#include "mem/ruby/network/orion/power_ll.hh" +#include "mem/ruby/network/orion/parm_technology.hh" +#include "mem/ruby/network/orion/SIM_port.hh" +#include "mem/ruby/network/orion/power_static.hh" +#include "mem/ruby/network/orion/power_utils.hh" /* ------- bus(link) model ---------- */ diff --git a/src/mem/ruby/network/orion/power_crossbar.cc b/src/mem/ruby/network/orion/power_crossbar.cc index d3e2232ae..a9f3e2e39 100644 --- a/src/mem/ruby/network/orion/power_crossbar.cc +++ b/src/mem/ruby/network/orion/power_crossbar.cc @@ -29,12 +29,12 @@ #include #include -#include "power_ll.hh" -#include "power_crossbar.hh" -#include "parm_technology.hh" -#include "SIM_port.hh" -#include "power_static.hh" -#include "power_utils.hh" +#include "mem/ruby/network/orion/power_ll.hh" +#include "mem/ruby/network/orion/power_crossbar.hh" +#include "mem/ruby/network/orion/parm_technology.hh" +#include "mem/ruby/network/orion/SIM_port.hh" +#include "mem/ruby/network/orion/power_static.hh" +#include "mem/ruby/network/orion/power_utils.hh" /*-------------------- CROSSBAR power model -------------------*/ diff --git a/src/mem/ruby/network/orion/power_ll.cc b/src/mem/ruby/network/orion/power_ll.cc index 3628989d0..aab98cc8c 100644 --- a/src/mem/ruby/network/orion/power_ll.cc +++ b/src/mem/ruby/network/orion/power_ll.cc @@ -70,10 +70,10 @@ #include #include -#include "parm_technology.hh" -#include "SIM_port.hh" -#include "power_static.hh" -#include "power_ll.hh" +#include "mem/ruby/network/orion/parm_technology.hh" +#include "mem/ruby/network/orion/SIM_port.hh" +#include "mem/ruby/network/orion/power_static.hh" +#include "mem/ruby/network/orion/power_ll.hh" /*----------------------------------------------------------------------*/ diff --git a/src/mem/ruby/network/orion/power_router_init.cc b/src/mem/ruby/network/orion/power_router_init.cc index be58fbdbf..9a8bc7f28 100644 --- a/src/mem/ruby/network/orion/power_router_init.cc +++ b/src/mem/ruby/network/orion/power_router_init.cc @@ -28,15 +28,15 @@ #include -#include "power_router_init.hh" -#include "power_array.hh" -#include "power_arbiter.hh" -#include "power_crossbar.hh" -#include "power_ll.hh" -#include "parm_technology.hh" -#include "SIM_port.hh" -#include "power_static.hh" -#include "power_utils.hh" +#include "mem/ruby/network/orion/power_router_init.hh" +#include "mem/ruby/network/orion/power_array.hh" +#include "mem/ruby/network/orion/power_arbiter.hh" +#include "mem/ruby/network/orion/power_crossbar.hh" +#include "mem/ruby/network/orion/power_ll.hh" +#include "mem/ruby/network/orion/parm_technology.hh" +#include "mem/ruby/network/orion/SIM_port.hh" +#include "mem/ruby/network/orion/power_static.hh" +#include "mem/ruby/network/orion/power_utils.hh" /* -------------------------------------------------------------------------------------------- */ // Set buffer parameters diff --git a/src/mem/ruby/network/orion/power_router_init.hh b/src/mem/ruby/network/orion/power_router_init.hh index 2d95cea0b..df0b8fb18 100644 --- a/src/mem/ruby/network/orion/power_router_init.hh +++ b/src/mem/ruby/network/orion/power_router_init.hh @@ -29,9 +29,9 @@ #ifndef _POWER_ROUTER_INIT_H #define _POWER_ROUTER_INIT_H -#include "power_array.hh" -#include "power_arbiter.hh" -#include "power_crossbar.hh" +#include "mem/ruby/network/orion/power_array.hh" +#include "mem/ruby/network/orion/power_arbiter.hh" +#include "mem/ruby/network/orion/power_crossbar.hh" /* ------------ Models ------------------------ */ /*typedef enum { diff --git a/src/mem/ruby/network/orion/power_static.cc b/src/mem/ruby/network/orion/power_static.cc index c0ae394a6..ded399000 100644 --- a/src/mem/ruby/network/orion/power_static.cc +++ b/src/mem/ruby/network/orion/power_static.cc @@ -26,7 +26,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "power_static.hh" +#include "mem/ruby/network/orion/power_static.hh" #if (PARM_TECH_POINT == 18) double NMOS_TAB[1] = {20.5e-9}; diff --git a/src/mem/ruby/network/orion/power_static.hh b/src/mem/ruby/network/orion/power_static.hh index 6bc58ca01..09f989aa2 100644 --- a/src/mem/ruby/network/orion/power_static.hh +++ b/src/mem/ruby/network/orion/power_static.hh @@ -29,7 +29,7 @@ #ifndef _POWER_STATIC_H #define _POWER_STATIC_H -#include "parm_technology.hh" +#include "mem/ruby/network/orion/parm_technology.hh" extern double NMOS_TAB[1]; extern double PMOS_TAB[1]; diff --git a/src/mem/ruby/network/orion/power_utils.cc b/src/mem/ruby/network/orion/power_utils.cc index 1f592fff0..be308be88 100644 --- a/src/mem/ruby/network/orion/power_utils.cc +++ b/src/mem/ruby/network/orion/power_utils.cc @@ -27,8 +27,8 @@ */ #include -#include "parm_technology.hh" -#include "power_utils.hh" +#include "mem/ruby/network/orion/parm_technology.hh" +#include "mem/ruby/network/orion/power_utils.hh" #include #include -- cgit v1.2.3