Yu-hsin Wang has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/57549 )
Change subject: fastmodel: Upgrade to FastModel 11.17
......................................................................
fastmodel: Upgrade to FastModel 11.17
The first big change is gcc-6.4 is no longer supported in FastModel
11.17. We switch to gcc-7.3. Next, TARGET_MAXVIEW is
replaced by TARGET_SYSTEMC_MAXVIEW. The default value of
TARGET_SYSTEMC_MAXVIEW is zero. So we can simply remove TARGET_MAXVIEW.
Finally, I fixed an undefined exception in the build script.
Change-Id: I5ec70112056513c253e6127ed5f8abacf191431f
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/57549
Reviewed-by: Gabe Black <gabe.bl...@gmail.com>
Maintainer: Gabe Black <gabe.bl...@gmail.com>
Tested-by: kokoro <noreply+kok...@google.com>
---
M src/arch/arm/fastmodel/CortexA76/x1/x1.sgproj
M src/arch/arm/fastmodel/CortexA76/x2/x2.sgproj
M src/arch/arm/fastmodel/CortexA76/x3/x3.sgproj
M src/arch/arm/fastmodel/CortexA76/x4/x4.sgproj
M src/arch/arm/fastmodel/CortexR52/x1/x1.sgproj
M src/arch/arm/fastmodel/CortexR52/x2/x2.sgproj
M src/arch/arm/fastmodel/CortexR52/x3/x3.sgproj
M src/arch/arm/fastmodel/CortexR52/x4/x4.sgproj
M src/arch/arm/fastmodel/GIC/GIC.sgproj
M src/arch/arm/fastmodel/PL330_DMAC/PL330.sgproj
M src/arch/arm/fastmodel/SConscript
M src/arch/arm/fastmodel/SConsopts
12 files changed, 31 insertions(+), 22 deletions(-)
Approvals:
Gabe Black: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/arch/arm/fastmodel/CortexA76/x1/x1.sgproj
b/src/arch/arm/fastmodel/CortexA76/x1/x1.sgproj
index ff839685..f3fd0db 100644
--- a/src/arch/arm/fastmodel/CortexA76/x1/x1.sgproj
+++ b/src/arch/arm/fastmodel/CortexA76/x1/x1.sgproj
@@ -8,13 +8,12 @@
ADDITIONAL_COMPILER_SETTINGS = "-O3 -Wall -std=c++14 -Wno-deprecated
-Wno-unused-function";
ADDITIONAL_LINKER_SETTINGS = "-Wl,--no-undefined";
BUILD_DIR = "./gcc";
- COMPILER = "gcc-6.4";
+ COMPILER = "gcc-7.3";
CONFIG_DESCRIPTION = "";
CONFIG_NAME = "gcc";
PLATFORM = "Linux64";
PREPROCESSOR_DEFINES = "NDEBUG";
SIMGEN_COMMAND_LINE = "--num-comps-file 50";
- TARGET_MAXVIEW = "0";
TARGET_SYSTEMC = "1";
TARGET_SYSTEMC_AUTO = "1";
diff --git a/src/arch/arm/fastmodel/CortexA76/x2/x2.sgproj
b/src/arch/arm/fastmodel/CortexA76/x2/x2.sgproj
index 8ecb76f..abec8ad 100644
--- a/src/arch/arm/fastmodel/CortexA76/x2/x2.sgproj
+++ b/src/arch/arm/fastmodel/CortexA76/x2/x2.sgproj
@@ -8,13 +8,12 @@
ADDITIONAL_COMPILER_SETTINGS = "-march=core2 -O3 -Wall -std=c++14
-Wno-deprecated -Wno-unused-function";
ADDITIONAL_LINKER_SETTINGS = "-Wl,--no-undefined";
BUILD_DIR = "./gcc";
- COMPILER = "gcc-6.4";
+ COMPILER = "gcc-7.3";
CONFIG_DESCRIPTION = "";
CONFIG_NAME = "gcc";
PLATFORM = "Linux64";
PREPROCESSOR_DEFINES = "NDEBUG";
SIMGEN_COMMAND_LINE = "--num-comps-file 50";
- TARGET_MAXVIEW = "0";
TARGET_SYSTEMC = "1";
TARGET_SYSTEMC_AUTO = "1";
diff --git a/src/arch/arm/fastmodel/CortexA76/x3/x3.sgproj
b/src/arch/arm/fastmodel/CortexA76/x3/x3.sgproj
index 36cfec7..666b1dc 100644
--- a/src/arch/arm/fastmodel/CortexA76/x3/x3.sgproj
+++ b/src/arch/arm/fastmodel/CortexA76/x3/x3.sgproj
@@ -8,13 +8,12 @@
ADDITIONAL_COMPILER_SETTINGS = "-march=core2 -O3 -Wall -std=c++14
-Wno-deprecated -Wno-unused-function";
ADDITIONAL_LINKER_SETTINGS = "-Wl,--no-undefined";
BUILD_DIR = "./gcc";
- COMPILER = "gcc-6.4";
+ COMPILER = "gcc-7.3";
CONFIG_DESCRIPTION = "";
CONFIG_NAME = "gcc";
PLATFORM = "Linux64";
PREPROCESSOR_DEFINES = "NDEBUG";
SIMGEN_COMMAND_LINE = "--num-comps-file 50";
- TARGET_MAXVIEW = "0";
TARGET_SYSTEMC = "1";
TARGET_SYSTEMC_AUTO = "1";
diff --git a/src/arch/arm/fastmodel/CortexA76/x4/x4.sgproj
b/src/arch/arm/fastmodel/CortexA76/x4/x4.sgproj
index 291256b..e3c9063 100644
--- a/src/arch/arm/fastmodel/CortexA76/x4/x4.sgproj
+++ b/src/arch/arm/fastmodel/CortexA76/x4/x4.sgproj
@@ -8,13 +8,12 @@
ADDITIONAL_COMPILER_SETTINGS = "-march=core2 -O3 -Wall -std=c++14
-Wno-deprecated -Wno-unused-function";
ADDITIONAL_LINKER_SETTINGS = "-Wl,--no-undefined";
BUILD_DIR = "./gcc";
- COMPILER = "gcc-6.4";
+ COMPILER = "gcc-7.3";
CONFIG_DESCRIPTION = "";
CONFIG_NAME = "gcc";
PLATFORM = "Linux64";
PREPROCESSOR_DEFINES = "NDEBUG";
SIMGEN_COMMAND_LINE = "--num-comps-file 50";
- TARGET_MAXVIEW = "0";
TARGET_SYSTEMC = "1";
TARGET_SYSTEMC_AUTO = "1";
diff --git a/src/arch/arm/fastmodel/CortexR52/x1/x1.sgproj
b/src/arch/arm/fastmodel/CortexR52/x1/x1.sgproj
index 4e8d35f..9d2a574 100644
--- a/src/arch/arm/fastmodel/CortexR52/x1/x1.sgproj
+++ b/src/arch/arm/fastmodel/CortexR52/x1/x1.sgproj
@@ -8,13 +8,12 @@
ADDITIONAL_COMPILER_SETTINGS = "-O3 -Wall -std=c++14 -Wno-deprecated
-Wno-unused-function";
ADDITIONAL_LINKER_SETTINGS = "-Wl,--no-undefined";
BUILD_DIR = "./gcc";
- COMPILER = "gcc-6.4";
+ COMPILER = "gcc-7.3";
CONFIG_DESCRIPTION = "";
CONFIG_NAME = "gcc";
PLATFORM = "Linux64";
PREPROCESSOR_DEFINES = "NDEBUG";
SIMGEN_COMMAND_LINE = "--num-comps-file 50";
- TARGET_MAXVIEW = "0";
TARGET_SYSTEMC = "1";
TARGET_SYSTEMC_AUTO = "1";
diff --git a/src/arch/arm/fastmodel/CortexR52/x2/x2.sgproj
b/src/arch/arm/fastmodel/CortexR52/x2/x2.sgproj
index ad3d40a..e103170 100644
--- a/src/arch/arm/fastmodel/CortexR52/x2/x2.sgproj
+++ b/src/arch/arm/fastmodel/CortexR52/x2/x2.sgproj
@@ -8,13 +8,12 @@
ADDITIONAL_COMPILER_SETTINGS = "-march=core2 -O3 -Wall -std=c++14
-Wno-deprecated -Wno-unused-function";
ADDITIONAL_LINKER_SETTINGS = "-Wl,--no-undefined";
BUILD_DIR = "./gcc";
- COMPILER = "gcc-6.4";
+ COMPILER = "gcc-7.3";
CONFIG_DESCRIPTION = "";
CONFIG_NAME = "gcc";
PLATFORM = "Linux64";
PREPROCESSOR_DEFINES = "NDEBUG";
SIMGEN_COMMAND_LINE = "--num-comps-file 50";
- TARGET_MAXVIEW = "0";
TARGET_SYSTEMC = "1";
TARGET_SYSTEMC_AUTO = "1";
diff --git a/src/arch/arm/fastmodel/CortexR52/x3/x3.sgproj
b/src/arch/arm/fastmodel/CortexR52/x3/x3.sgproj
index a5d269e..0c92809 100644
--- a/src/arch/arm/fastmodel/CortexR52/x3/x3.sgproj
+++ b/src/arch/arm/fastmodel/CortexR52/x3/x3.sgproj
@@ -8,13 +8,12 @@
ADDITIONAL_COMPILER_SETTINGS = "-march=core2 -O3 -Wall -std=c++14
-Wno-deprecated -Wno-unused-function";
ADDITIONAL_LINKER_SETTINGS = "-Wl,--no-undefined";
BUILD_DIR = "./gcc";
- COMPILER = "gcc-6.4";
+ COMPILER = "gcc-7.3";
CONFIG_DESCRIPTION = "";
CONFIG_NAME = "gcc";
PLATFORM = "Linux64";
PREPROCESSOR_DEFINES = "NDEBUG";
SIMGEN_COMMAND_LINE = "--num-comps-file 50";
- TARGET_MAXVIEW = "0";
TARGET_SYSTEMC = "1";
TARGET_SYSTEMC_AUTO = "1";
diff --git a/src/arch/arm/fastmodel/CortexR52/x4/x4.sgproj
b/src/arch/arm/fastmodel/CortexR52/x4/x4.sgproj
index d33f850..6a145fd 100644
--- a/src/arch/arm/fastmodel/CortexR52/x4/x4.sgproj
+++ b/src/arch/arm/fastmodel/CortexR52/x4/x4.sgproj
@@ -8,13 +8,12 @@
ADDITIONAL_COMPILER_SETTINGS = "-march=core2 -O3 -Wall -std=c++14
-Wno-deprecated -Wno-unused-function";
ADDITIONAL_LINKER_SETTINGS = "-Wl,--no-undefined";
BUILD_DIR = "./gcc";
- COMPILER = "gcc-6.4";
+ COMPILER = "gcc-7.3";
CONFIG_DESCRIPTION = "";
CONFIG_NAME = "gcc";
PLATFORM = "Linux64";
PREPROCESSOR_DEFINES = "NDEBUG";
SIMGEN_COMMAND_LINE = "--num-comps-file 50";
- TARGET_MAXVIEW = "0";
TARGET_SYSTEMC = "1";
TARGET_SYSTEMC_AUTO = "1";
diff --git a/src/arch/arm/fastmodel/GIC/GIC.sgproj
b/src/arch/arm/fastmodel/GIC/GIC.sgproj
index 7c503b2..aa5e6ae 100644
--- a/src/arch/arm/fastmodel/GIC/GIC.sgproj
+++ b/src/arch/arm/fastmodel/GIC/GIC.sgproj
@@ -8,13 +8,12 @@
ADDITIONAL_COMPILER_SETTINGS = "-O3 -Wall -std=c++14 -Wno-deprecated
-Wno-unused-function -I../../../../../";
ADDITIONAL_LINKER_SETTINGS = "-Wl,--no-undefined";
BUILD_DIR = "./gcc";
- COMPILER = "gcc-6.4";
+ COMPILER = "gcc-7.3";
CONFIG_DESCRIPTION = "";
CONFIG_NAME = "gcc";
PLATFORM = "Linux64";
PREPROCESSOR_DEFINES = "NDEBUG";
SIMGEN_COMMAND_LINE = "--num-comps-file 50";
- TARGET_MAXVIEW = "0";
TARGET_SYSTEMC = "1";
TARGET_SYSTEMC_AUTO = "1";
}
diff --git a/src/arch/arm/fastmodel/PL330_DMAC/PL330.sgproj
b/src/arch/arm/fastmodel/PL330_DMAC/PL330.sgproj
index 31eef35..d59849c 100644
--- a/src/arch/arm/fastmodel/PL330_DMAC/PL330.sgproj
+++ b/src/arch/arm/fastmodel/PL330_DMAC/PL330.sgproj
@@ -8,13 +8,12 @@
ADDITIONAL_COMPILER_SETTINGS = "-O3 -Wall -std=c++14 -Wno-deprecated
-Wno-unused-function -I../../../../../";
ADDITIONAL_LINKER_SETTINGS = "-Wl,--no-undefined";
BUILD_DIR = "./gcc";
- COMPILER = "gcc-6.4";
+ COMPILER = "gcc-7.3";
CONFIG_DESCRIPTION = "";
CONFIG_NAME = "gcc";
PLATFORM = "Linux64";
PREPROCESSOR_DEFINES = "NDEBUG";
SIMGEN_COMMAND_LINE = "--num-comps-file 50";
- TARGET_MAXVIEW = "0";
TARGET_SYSTEMC = "1";
TARGET_SYSTEMC_AUTO = "1";
}
diff --git a/src/arch/arm/fastmodel/SConscript
b/src/arch/arm/fastmodel/SConscript
index 69749bf..00aec93 100644
--- a/src/arch/arm/fastmodel/SConscript
+++ b/src/arch/arm/fastmodel/SConscript
@@ -104,7 +104,7 @@
full_name = Dir(path).File(static_name).get_abspath()
if os.path.isfile(full_name):
return File(full_name)
- raise BuildError("Failed to find FM static lib: " + name)
+ error("Failed to find FM static lib: " + name)
# Adjust the build environment to support building in Fast Models.
diff --git a/src/arch/arm/fastmodel/SConsopts
b/src/arch/arm/fastmodel/SConsopts
index c7bfd84..d3f8980 100644
--- a/src/arch/arm/fastmodel/SConsopts
+++ b/src/arch/arm/fastmodel/SConsopts
@@ -36,7 +36,7 @@
('PVLIB_HOME', 'Fast Model portfolio directory',
os.environ.get('PVLIB_HOME', '')),
('PVLIB_FLAVOR', 'What build flavor of the Fast Model pvlib to use',
- 'Linux64_GCC-6.4'),
+ 'Linux64_GCC-7.3'),
('MAXCORE_HOME', 'Fast Model tools directory',
os.environ.get('MAXCORE_HOME', '')),
('ARMLMD_LICENSE_FILE', 'ARM license file location',
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/57549
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: I5ec70112056513c253e6127ed5f8abacf191431f
Gerrit-Change-Number: 57549
Gerrit-PatchSet: 3
Gerrit-Owner: Yu-hsin Wang <yuhsi...@google.com>
Gerrit-Reviewer: Earl Ou <shunhsin...@google.com>
Gerrit-Reviewer: Gabe Black <gabe.bl...@gmail.com>
Gerrit-Reviewer: Gabe Black <gabebl...@google.com>
Gerrit-Reviewer: Yu-hsin Wang <yuhsi...@google.com>
Gerrit-Reviewer: kokoro <noreply+kok...@google.com>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
