[gem5-dev] Change in gem5/gem5[develop]: fastmodel: Update to c++14, and add some missing consts.

Gabe Black (Gerrit) via gem5-dev Tue, 13 Oct 2020 17:16:23 -0700

Gabe Black has submitted this change. (https://gem5-review.googlesource.com/c/public/gem5/+/35857 )


Change subject: fastmodel: Update to c++14, and add some missing consts.
......................................................................


fastmodel: Update to c++14, and add some missing consts.

During the review for the CortexR52 model, a comment pointed out where
two consts can be added. Also we switched gem5 over to c++14, but the
project files for these other wrappers were still set to c++11.

Change-Id: I5fecdc896b0290deadcd0f55ea1dfe3806a98177
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/35857
Reviewed-by: Giacomo Travaglini <[email protected]>
Maintainer: Gabe Black <[email protected]>
Tested-by: kokoro <[email protected]>
---
M src/arch/arm/fastmodel/CortexA76/cortex_a76.hh
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/GIC/GIC.sgproj
6 files changed, 7 insertions(+), 7 deletions(-)

Approvals:
  Giacomo Travaglini: Looks good to me, approved
  Gabe Black: Looks good to me, approved
  kokoro: Regressions pass

diff --git a/src/arch/arm/fastmodel/CortexA76/cortex_a76.hhb/src/arch/arm/fastmodel/CortexA76/cortex_a76.hh

index acbae89..6088b0a 100644
--- a/src/arch/arm/fastmodel/CortexA76/cortex_a76.hh
+++ b/src/arch/arm/fastmodel/CortexA76/cortex_a76.hh
@@ -107,8 +107,8 @@
         scx::scx_set_parameter(evs->name() + std::string(".") + n, val);
     }

-    CortexA76 *getCore(int num) { return cores.at(num); }
-    sc_core::sc_module *getEvs() { return evs; }
+    CortexA76 *getCore(int num) const { return cores.at(num); }
+    sc_core::sc_module *getEvs() const { return evs; }

     CortexA76Cluster(Params &p);
     const Params &params() { return _params; }

diff --git a/src/arch/arm/fastmodel/CortexA76/x1/x1.sgprojb/src/arch/arm/fastmodel/CortexA76/x1/x1.sgproj

index 214653f..ff83968 100644
--- a/src/arch/arm/fastmodel/CortexA76/x1/x1.sgproj
+++ b/src/arch/arm/fastmodel/CortexA76/x1/x1.sgproj
@@ -5,7 +5,7 @@
 ACTIVE_CONFIG_WINDOWS  = "Win64-Release-VC2015";
 config "gcc"
 {

- ADDITIONAL_COMPILER_SETTINGS = "-O3 -Wall -std=c++11 -Wno-deprecated-Wno-unused-function";+ 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";

diff --git a/src/arch/arm/fastmodel/CortexA76/x2/x2.sgprojb/src/arch/arm/fastmodel/CortexA76/x2/x2.sgproj

index 92eeb4d..8ecb76f 100644
--- a/src/arch/arm/fastmodel/CortexA76/x2/x2.sgproj
+++ b/src/arch/arm/fastmodel/CortexA76/x2/x2.sgproj
@@ -5,7 +5,7 @@
 ACTIVE_CONFIG_WINDOWS  = "Win64-Release-VC2015";
 config "gcc"
 {

- ADDITIONAL_COMPILER_SETTINGS = "-march=core2 -O3 -Wall -std=c++11-Wno-deprecated -Wno-unused-function";+ 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";

diff --git a/src/arch/arm/fastmodel/CortexA76/x3/x3.sgprojb/src/arch/arm/fastmodel/CortexA76/x3/x3.sgproj

index e661c4f..36cfec7 100644
--- a/src/arch/arm/fastmodel/CortexA76/x3/x3.sgproj
+++ b/src/arch/arm/fastmodel/CortexA76/x3/x3.sgproj
@@ -5,7 +5,7 @@
 ACTIVE_CONFIG_WINDOWS  = "Win64-Release-VC2015";
 config "gcc"
 {

     ADDITIONAL_LINKER_SETTINGS = "-Wl,--no-undefined";
     BUILD_DIR = "./gcc";
     COMPILER = "gcc-6.4";

diff --git a/src/arch/arm/fastmodel/CortexA76/x4/x4.sgprojb/src/arch/arm/fastmodel/CortexA76/x4/x4.sgproj

index 5b7f315..291256b 100644
--- a/src/arch/arm/fastmodel/CortexA76/x4/x4.sgproj
+++ b/src/arch/arm/fastmodel/CortexA76/x4/x4.sgproj
@@ -5,7 +5,7 @@
 ACTIVE_CONFIG_WINDOWS  = "Win64-Release-VC2015";
 config "gcc"
 {

     ADDITIONAL_LINKER_SETTINGS = "-Wl,--no-undefined";
     BUILD_DIR = "./gcc";
     COMPILER = "gcc-6.4";

diff --git a/src/arch/arm/fastmodel/GIC/GIC.sgprojb/src/arch/arm/fastmodel/GIC/GIC.sgproj

index c016705..c835356 100644
--- a/src/arch/arm/fastmodel/GIC/GIC.sgproj
+++ b/src/arch/arm/fastmodel/GIC/GIC.sgproj
@@ -5,7 +5,7 @@
 ACTIVE_CONFIG_WINDOWS  = "Win64-Release-VC2015";
 config "gcc"
 {

- ADDITIONAL_COMPILER_SETTINGS = "-O3 -Wall -std=c++11 -Wno-deprecated-Wno-unused-function -I../../../../../";+ 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";

--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/35857

To unsubscribe, or for help writing mail filters, visithttps://gem5-review.googlesource.com/settings


Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: I5fecdc896b0290deadcd0f55ea1dfe3806a98177
Gerrit-Change-Number: 35857
Gerrit-PatchSet: 2
Gerrit-Owner: Gabe Black <[email protected]>
Gerrit-Reviewer: Andreas Sandberg <[email protected]>
Gerrit-Reviewer: Chris January <[email protected]>
Gerrit-Reviewer: Gabe Black <[email protected]>
Gerrit-Reviewer: Giacomo Travaglini <[email protected]>
Gerrit-Reviewer: kokoro <[email protected]>
Gerrit-MessageType: merged

_______________________________________________
gem5-dev mailing list -- [email protected]
To unsubscribe send an email to [email protected]
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s

[gem5-dev] Change in gem5/gem5[develop]: fastmodel: Update to c++14, and add some missing consts.

Reply via email to