From 121160d97f3d41220a26d3371a277434c3defea3 Mon Sep 17 00:00:00 2001 From: "Daniel R. Carvalho" Date: Wed, 7 Nov 2018 10:24:24 +0100 Subject: [PATCH] configs: Add missing path to ruby imports Add missing addToPath to ruby files, so that import modules from previous folder are visible. Change-Id: I912d78a2f709974f72fe768e73abac1617126f46 Signed-off-by: Daniel R. Carvalho Reviewed-on: https://gem5-review.googlesource.com/c/13995 Reviewed-by: Jason Lowe-Power Reviewed-by: Anthony Gutierrez Maintainer: Jason Lowe-Power --- configs/ruby/AMD_Base_Constructor.py | 5 ++++- configs/ruby/GPU_RfO.py | 3 +++ configs/ruby/GPU_VIPER.py | 3 +++ configs/ruby/GPU_VIPER_Baseline.py | 3 +++ configs/ruby/GPU_VIPER_Region.py | 3 +++ configs/ruby/MOESI_AMD_Base.py | 3 +++ configs/ruby/Ruby.py | 2 ++ 7 files changed, 21 insertions(+), 1 deletion(-) diff --git a/configs/ruby/AMD_Base_Constructor.py b/configs/ruby/AMD_Base_Constructor.py index 23a80a7ef..96f657589 100644 --- a/configs/ruby/AMD_Base_Constructor.py +++ b/configs/ruby/AMD_Base_Constructor.py @@ -36,8 +36,11 @@ import math import m5 from m5.objects import * from m5.defines import buildEnv -from m5.util import convert +from m5.util import addToPath, convert from CntrlBase import * + +addToPath('../') + from topologies.Cluster import Cluster # diff --git a/configs/ruby/GPU_RfO.py b/configs/ruby/GPU_RfO.py index 895c69366..fea5e5af4 100644 --- a/configs/ruby/GPU_RfO.py +++ b/configs/ruby/GPU_RfO.py @@ -35,9 +35,12 @@ import math import m5 from m5.objects import * from m5.defines import buildEnv +from m5.util import addToPath from Ruby import create_topology from Ruby import send_evicts +addToPath('../') + from topologies.Cluster import Cluster from topologies.Crossbar import Crossbar diff --git a/configs/ruby/GPU_VIPER.py b/configs/ruby/GPU_VIPER.py index 87c84b898..8d1223025 100644 --- a/configs/ruby/GPU_VIPER.py +++ b/configs/ruby/GPU_VIPER.py @@ -35,9 +35,12 @@ import math import m5 from m5.objects import * from m5.defines import buildEnv +from m5.util import addToPath from Ruby import create_topology from Ruby import send_evicts +addToPath('../') + from topologies.Cluster import Cluster from topologies.Crossbar import Crossbar diff --git a/configs/ruby/GPU_VIPER_Baseline.py b/configs/ruby/GPU_VIPER_Baseline.py index 19005ead7..960cbbdd6 100644 --- a/configs/ruby/GPU_VIPER_Baseline.py +++ b/configs/ruby/GPU_VIPER_Baseline.py @@ -35,9 +35,12 @@ import math import m5 from m5.objects import * from m5.defines import buildEnv +from m5.util import addToPath from Ruby import create_topology from Ruby import send_evicts +addToPath('../') + from topologies.Cluster import Cluster from topologies.Crossbar import Crossbar diff --git a/configs/ruby/GPU_VIPER_Region.py b/configs/ruby/GPU_VIPER_Region.py index 98a054e9e..90e8b773a 100644 --- a/configs/ruby/GPU_VIPER_Region.py +++ b/configs/ruby/GPU_VIPER_Region.py @@ -35,8 +35,11 @@ import math import m5 from m5.objects import * from m5.defines import buildEnv +from m5.util import addToPath from Ruby import send_evicts +addToPath('../') + from topologies.Cluster import Cluster class CntrlBase: diff --git a/configs/ruby/MOESI_AMD_Base.py b/configs/ruby/MOESI_AMD_Base.py index 407f2e86c..ad1654393 100644 --- a/configs/ruby/MOESI_AMD_Base.py +++ b/configs/ruby/MOESI_AMD_Base.py @@ -35,9 +35,12 @@ import math import m5 from m5.objects import * from m5.defines import buildEnv +from m5.util import addToPath from Ruby import create_topology from Ruby import send_evicts +addToPath('../') + from topologies.Cluster import Cluster from topologies.Crossbar import Crossbar diff --git a/configs/ruby/Ruby.py b/configs/ruby/Ruby.py index 2fb174061..2ddf608fb 100644 --- a/configs/ruby/Ruby.py +++ b/configs/ruby/Ruby.py @@ -47,6 +47,8 @@ from m5.objects import * from m5.defines import buildEnv from m5.util import addToPath, fatal +addToPath('../') + from common import MemConfig from topologies import * -- 2.30.2