From 68fdccb30bd85cd99823fb411ec7ae67112062d7 Mon Sep 17 00:00:00 2001 From: Andreas Hansson Date: Thu, 13 Oct 2016 03:17:19 -0400 Subject: ruby: Fix regressions and make Ruby configs Python packages This patch moves the addition of network options into the Ruby module to avoid the regressions all having to add it explicitly. Doing this exposes an issue in our current config system though, namely the fact that addtoPath is relative to the Python script being executed. Since both example and regression scripts use the Ruby module we would end up with two different (relative) paths being added. Instead we take a first step at turning the config modules into Python packages, simply by adding a __init__.py in the configs/ruby, configs/topologies and configs/network subdirectories. As a result, we can now add the top-level configs directory to the Python search path, and then use the package names in the various modules. The example scripts are also updated, and the messy path-deducing variations in the scripts are unified. --- configs/example/garnet_synth_traffic.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'configs/example/garnet_synth_traffic.py') diff --git a/configs/example/garnet_synth_traffic.py b/configs/example/garnet_synth_traffic.py index 8962c4af1..f11022006 100644 --- a/configs/example/garnet_synth_traffic.py +++ b/configs/example/garnet_synth_traffic.py @@ -32,13 +32,10 @@ from m5.defines import buildEnv from m5.util import addToPath import os, optparse, sys addToPath('../common') -addToPath('../ruby') -addToPath('../network') -addToPath('../topologies') +addToPath('../') import Options -import Ruby -import Network +from ruby import Ruby # Get paths we might need. It's expected this file is in m5/configs/example. config_path = os.path.dirname(os.path.abspath(__file__)) @@ -87,7 +84,6 @@ parser.add_option("--inj-vnet", type="int", default=-1, # Add the ruby specific and protocol specific options # Ruby.define_options(parser) -Network.define_options(parser) execfile(os.path.join(config_root, "common", "Options.py")) -- cgit v1.2.3