[gem5-dev] Change in gem5/gem5[develop]: gpu-compute: Explicitly set driver to nullptr in constructor
Bobby R. Bruce has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/41973 )
Change subject: gpu-compute: Explicitly set driver to nullptr in constructor
..
gpu-compute: Explicitly set driver to nullptr in constructor
We have a fail_if in attachDriver to prevent driver from being
overwritten. However, the fail_if only checks for if the driver
is not nullptr.
Previously, in some cases driver was set to garbage, which made
the fail_if trip the first time we were assigning the driver.
This patch explicitly sets driver to nullptr in the constructor, thus
ensuring that it will be nullptr the first time we call attachDriver
Change-Id: I325f6033e785025a912e3af3888c66cee0332f40
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/41973
Reviewed-by: Matt Sinclair
Maintainer: Matt Sinclair
Tested-by: kokoro
---
M src/gpu-compute/gpu_command_processor.cc
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Matt Sinclair: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/gpu-compute/gpu_command_processor.cc
b/src/gpu-compute/gpu_command_processor.cc
index da21076..5a9bbd5 100644
--- a/src/gpu-compute/gpu_command_processor.cc
+++ b/src/gpu-compute/gpu_command_processor.cc
@@ -42,7 +42,7 @@
#include "sim/syscall_emul_buf.hh"
GPUCommandProcessor::GPUCommandProcessor(const Params )
-: HSADevice(p), dispatcher(*p.dispatcher)
+: HSADevice(p), dispatcher(*p.dispatcher), driver(nullptr)
{
dispatcher.setCommandProcessor(this);
}
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/41973
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: I325f6033e785025a912e3af3888c66cee0332f40
Gerrit-Change-Number: 41973
Gerrit-PatchSet: 3
Gerrit-Owner: Kyle Roarty
Gerrit-Reviewer: Bobby R. Bruce
Gerrit-Reviewer: Jason Lowe-Power
Gerrit-Reviewer: Matt Sinclair
Gerrit-Reviewer: Matthew Poremba
Gerrit-Reviewer: kokoro
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
[gem5-dev] Change in gem5/gem5[develop]: base-stats,python: Add Python Stats
pe = StorageType["f64"]
+
+# Sometimes elements within a vector are defined by their name.
Other
+# times they have no name. When a name is not available, we name
the
+# stat the index value.
+if str(statistic.subnames[index]):
+index_string = str(statistic.subnames[index])
+else:
+index_string = str(index)
+
+to_add[index_string] = Scalar(
+ value=value,
+ unit=unit,
+ description=description,
+ datatype=datatype,
+ )
+
+return Vector(scalar_map=to_add)
+
+def _prepare_stats(group: _m5.stats.Group):
+"""
+Prepares the statistics for dumping.
+"""
+
+group.preDumpStats()
+
+for stat in group.getStats():
+stat.prepare()
+
+for child in getStatGroups().values():
+_prepare_stats(child)
+
+
+def get_simstat(root: Union[Root, List[SimObject]],
+prepare_stats: bool = True) -> SimStat:
+"""
+This function will return the SimStat object for a simulation. From the
+SimStat object all stats within the current gem5 simulation are
present.
+
+Parameters
+--
+root: Union[Root, List[Root]]
+The root, or a list of Simobjects, of the simulation for
translation to
+a SimStat object.
+
+prepare_stats: bool
+Dictates whether the stats are to be prepared prior to creating the
+SimStat object. By default this is 'True'.
+
+Returns
+---
+SimStat
+The SimStat Object of the current simulation.
+
+"""
+stats_map = {}
+creation_time = datetime.now()
+time_converstion = None # TODO
https://gem5.atlassian.net/browse/GEM5-846
+final_tick = Root.getInstance().resolveStat("finalTick").value
+sim_ticks = Root.getInstance().resolveStat("simTicks").value
+simulated_begin_time = int(final_tick - sim_ticks)
+simulated_end_time = int(final_tick)
+
+if prepare_stats:
+_m5.stats.processDumpQueue()
+
+for r in root:
+if isinstance(r, Root):
+if prepare_stats:
+_prepare_stats(r)
+for key in r.getStatGroups():
+ stats_map[key] = get_stats_group(r.getStatGroups()[key])
+elif isinstance(r, SimObject):
+ if prepare_stats:
+_prepare_stats(r)
+stats_map[r.name] = get_stats_group(r)
+else:
+raise TypeError("Object (" + str(r) + ") passed is neither
Root "
+"nor SimObject. " + __name__ + " only
processes "
+"Roots, SimObjects, or a list of Roots and/or "
+"SimObjects.")
+
+
+
+return SimStat(
+ creation_time=creation_time,
+ time_conversion=time_converstion,
+ simulated_begin_time=simulated_begin_time,
+ simulated_end_time=simulated_end_time,
+ **stats_map,
+ )
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/38615
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: I253a869f6b6d8c0de4dbed708892ee0cc33c5665
Gerrit-Change-Number: 38615
Gerrit-PatchSet: 23
Gerrit-Owner: Bobby R. Bruce
Gerrit-Reviewer: Andreas Sandberg
Gerrit-Reviewer: Anthony Gutierrez
Gerrit-Reviewer: Bobby R. Bruce
Gerrit-Reviewer: Ciro Santilli
Gerrit-Reviewer: Daniel Carvalho
Gerrit-Reviewer: Gabe Black
Gerrit-Reviewer: Giacomo Travaglini
Gerrit-Reviewer: Hoa Nguyen
Gerrit-Reviewer: Jason Lowe-Power
Gerrit-Reviewer: Jason Lowe-Power
Gerrit-Reviewer: Richard Cooper
Gerrit-Reviewer: kokoro
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
[gem5-dev] Change in gem5/gem5[develop]: base-stats,python: Expose a stat's unit via PyBind11
Bobby R. Bruce has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/41753 )
Change subject: base-stats,python: Expose a stat's unit via PyBind11
..
base-stats,python: Expose a stat's unit via PyBind11
Change-Id: I77df868a6bc92e5bb0a39592b5aca8e0d259bb05
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/41753
Tested-by: kokoro
Reviewed-by: Jason Lowe-Power
Maintainer: Jason Lowe-Power
---
M src/python/pybind11/stats.cc
1 file changed, 3 insertions(+), 0 deletions(-)
Approvals:
Jason Lowe-Power: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/python/pybind11/stats.cc b/src/python/pybind11/stats.cc
index 1e6773f..f1b1e9c 100644
--- a/src/python/pybind11/stats.cc
+++ b/src/python/pybind11/stats.cc
@@ -132,6 +132,9 @@
py::class_>(
m, "Info")
.def_readwrite("name", ::Info::name)
+.def_property_readonly("unit", [](const Stats::Info ) {
+return info.unit->getUnitString();
+})
.def_readonly("desc", ::Info::desc)
.def_readonly("id", ::Info::id)
.def_property_readonly("flags", [](const Stats::Info ) {
1 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the
submitted one.
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/41753
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: I77df868a6bc92e5bb0a39592b5aca8e0d259bb05
Gerrit-Change-Number: 41753
Gerrit-PatchSet: 8
Gerrit-Owner: Bobby R. Bruce
Gerrit-Reviewer: Andreas Sandberg
Gerrit-Reviewer: Bobby R. Bruce
Gerrit-Reviewer: Jason Lowe-Power
Gerrit-Reviewer: Jason Lowe-Power
Gerrit-Reviewer: kokoro
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
[gem5-dev] Change in gem5/gem5[develop]: base-stats,python: Add Units to the Python Stats
Bobby R. Bruce has submitted this change. ( https://gem5-review.googlesource.com/c/public/gem5/+/41754 ) Change subject: base-stats,python: Add Units to the Python Stats .. base-stats,python: Add Units to the Python Stats Change-Id: Ic8d3c9a5c2bb7fbe51b8672b74b0e5fb17906a5e Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/41754 Tested-by: kokoro Reviewed-by: Bobby R. Bruce Maintainer: Bobby R. Bruce --- M src/python/m5/stats/gem5stats.py 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Bobby R. Bruce: Looks good to me, approved; Looks good to me, approved kokoro: Regressions pass diff --git a/src/python/m5/stats/gem5stats.py b/src/python/m5/stats/gem5stats.py index 3afc776..9446045 100644 --- a/src/python/m5/stats/gem5stats.py +++ b/src/python/m5/stats/gem5stats.py @@ -148,7 +148,7 @@ def __get_scaler(statistic: _m5.stats.ScalarInfo) -> Scalar: value = statistic.value -unit = None # TODO https://gem5.atlassian.net/browse/GEM5-850. +unit = statistic.unit description = statistic.desc # ScalarInfo uses the C++ `double`. datatype = StorageType["f64"] @@ -161,7 +161,7 @@ ) def __get_distribution(statistic: _m5.stats.DistInfo) -> Distribution: -unit = None # TODO https://gem5.atlassian.net/browse/GEM5-850. +unit = statistic.unit description = statistic.desc value = statistic.values bin_size = statistic.bucket_size @@ -198,7 +198,7 @@ for index in range(statistic.size): # All the values in a Vector are Scalar values value = statistic.value[index] -unit = None # TODO https://gem5.atlassian.net/browse/GEM5-850. +unit = statistic.unit description = statistic.subdescs[index] # ScalarInfo uses the C++ `double`. datatype = StorageType["f64"] 4 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/41754 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: Ic8d3c9a5c2bb7fbe51b8672b74b0e5fb17906a5e Gerrit-Change-Number: 41754 Gerrit-PatchSet: 7 Gerrit-Owner: Bobby R. Bruce Gerrit-Reviewer: Andreas Sandberg Gerrit-Reviewer: Bobby R. Bruce Gerrit-Reviewer: Jason Lowe-Power Gerrit-Reviewer: Jason Lowe-Power Gerrit-Reviewer: kokoro 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
[gem5-dev] Change in gem5/gem5[develop]: base-stats: Fixed System "work_item" stat name
Bobby R. Bruce has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/41833 )
Change subject: base-stats: Fixed System "work_item" stat name
..
base-stats: Fixed System "work_item" stat name
The name of this stat was prefixed with 'system.'. Something which is
unecessary and undesirable for the stats output.
Change-Id: I873a77927e1ae6bb52f66e9c935e91ef43649dcd
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/41833
Tested-by: kokoro
Reviewed-by: Jason Lowe-Power
Maintainer: Jason Lowe-Power
---
M src/sim/system.cc
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Jason Lowe-Power: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/sim/system.cc b/src/sim/system.cc
index 93902af..4a9c6cd 100644
--- a/src/sim/system.cc
+++ b/src/sim/system.cc
@@ -483,7 +483,7 @@
std::stringstream namestr;
ccprintf(namestr, "work_item_type%d", j);
workItemStats[j]->init(20)
- .name(name() + "." + namestr.str())
+ .name(namestr.str())
.desc("Run time stat for" + namestr.str())
.prereq(*workItemStats[j]);
}
1 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the
submitted one.
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/41833
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: I873a77927e1ae6bb52f66e9c935e91ef43649dcd
Gerrit-Change-Number: 41833
Gerrit-PatchSet: 6
Gerrit-Owner: Bobby R. Bruce
Gerrit-Reviewer: Bobby R. Bruce
Gerrit-Reviewer: Jason Lowe-Power
Gerrit-Reviewer: kokoro
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
[gem5-dev] Change in gem5/gem5[develop]: sim,base-stats: Fix leading "." bug when obtaining requestors
Bobby R. Bruce has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/41513 )
Change subject: sim,base-stats: Fix leading "." bug when obtaining
requestors
..
sim,base-stats: Fix leading "." bug when obtaining requestors
When requestor id is requested, it is stripped of the System name via
the `stripSystemName` function in `system.cc`. However, there is a bug
in this code that leaves a leading ".". E.g.:
`system.cpu.mmu.dtb.walker` is stripped to `.cpu.mmu.dtb.walker`.
This patch fixes this issue.
Change-Id: I825cbc60c7f7eaa84c8a0150c30e9f2902cff6cb
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/41513
Tested-by: kokoro
Reviewed-by: Bobby R. Bruce
Maintainer: Bobby R. Bruce
---
M src/sim/system.cc
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Bobby R. Bruce: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/sim/system.cc b/src/sim/system.cc
index 5600542..93902af 100644
--- a/src/sim/system.cc
+++ b/src/sim/system.cc
@@ -532,7 +532,7 @@
System::stripSystemName(const std::string& requestor_name) const
{
if (startswith(requestor_name, name())) {
-return requestor_name.substr(name().size());
+return requestor_name.substr(name().size() + 1);
} else {
return requestor_name;
}
5 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the
submitted one.
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/41513
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: I825cbc60c7f7eaa84c8a0150c30e9f2902cff6cb
Gerrit-Change-Number: 41513
Gerrit-PatchSet: 8
Gerrit-Owner: Bobby R. Bruce
Gerrit-Reviewer: Andreas Sandberg
Gerrit-Reviewer: Bobby R. Bruce
Gerrit-Reviewer: Hoa Nguyen
Gerrit-Reviewer: Jason Lowe-Power
Gerrit-Reviewer: Jason Lowe-Power
Gerrit-Reviewer: kokoro
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
[gem5-dev] Change in gem5/gem5[develop]: arch-riscv,misc: Add missing overrides for clang compilation
Bobby R. Bruce has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/41913 )
Change subject: arch-riscv,misc: Add missing overrides for clang compilation
..
arch-riscv,misc: Add missing overrides for clang compilation
The Clang compiler returns "missing override" errors without these.
Change-Id: I62af6c338b000123c924f0b3205551579bd5aeb4
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/41913
Reviewed-by: Gabe Black
Reviewed-by: Hoa Nguyen
Maintainer: Bobby R. Bruce
Tested-by: kokoro
---
M src/arch/riscv/isa.hh
M src/dev/riscv/clint.hh
M src/dev/riscv/rtc.hh
3 files changed, 7 insertions(+), 5 deletions(-)
Approvals:
Hoa Nguyen: Looks good to me, approved
Gabe Black: Looks good to me, approved
Bobby R. Bruce: Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/arch/riscv/isa.hh b/src/arch/riscv/isa.hh
index 1c5dac3..7f03a17 100644
--- a/src/arch/riscv/isa.hh
+++ b/src/arch/riscv/isa.hh
@@ -97,8 +97,8 @@
bool inUserMode() const override { return true; }
-void serialize(CheckpointOut ) const;
-void unserialize(CheckpointIn );
+void serialize(CheckpointOut ) const override;
+void unserialize(CheckpointIn ) override;
ISA(const Params );
};
diff --git a/src/dev/riscv/clint.hh b/src/dev/riscv/clint.hh
index 7b1745c..1f213ce 100644
--- a/src/dev/riscv/clint.hh
+++ b/src/dev/riscv/clint.hh
@@ -139,7 +139,8 @@
* SimObject functions
*/
void init() override;
-Port & getPort(const std::string _name, PortID idx=InvalidPortID);
+Port & getPort(const std::string _name,
+ PortID idx=InvalidPortID) override;
void serialize(CheckpointOut ) const override;
void unserialize(CheckpointIn ) override;
diff --git a/src/dev/riscv/rtc.hh b/src/dev/riscv/rtc.hh
index bfd9071..42a2d29 100644
--- a/src/dev/riscv/rtc.hh
+++ b/src/dev/riscv/rtc.hh
@@ -70,9 +70,10 @@
RiscvRTC(const Params );
-Port & getPort(const std::string _name, PortID idx=InvalidPortID);
+Port & getPort(const std::string _name,
+ PortID idx=InvalidPortID) override;
-void startup();
+void startup() override;
void serialize(CheckpointOut ) const override;
void unserialize(CheckpointIn ) override;
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/41913
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: I62af6c338b000123c924f0b3205551579bd5aeb4
Gerrit-Change-Number: 41913
Gerrit-PatchSet: 2
Gerrit-Owner: Bobby R. Bruce
Gerrit-Reviewer: Ayaz Akram
Gerrit-Reviewer: Bobby R. Bruce
Gerrit-Reviewer: Gabe Black
Gerrit-Reviewer: Hoa Nguyen
Gerrit-Reviewer: Jason Lowe-Power
Gerrit-Reviewer: Peter Yuen
Gerrit-Reviewer: kokoro
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
[gem5-dev] Change in gem5/gem5[develop]: misc: Adding 'make' to the compiler Dockerfiles
Bobby R. Bruce has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/41873 )
Change subject: misc: Adding 'make' to the compiler Dockerfiles
..
misc: Adding 'make' to the compiler Dockerfiles
While gem5 will compile without make, LTO cannot link on multiple
threads without it.
Change-Id: Id5552aaa295e194789ab5f355bb62a3657384d38
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/41873
Reviewed-by: Gabe Black
Reviewed-by: Jason Lowe-Power
Maintainer: Jason Lowe-Power
Tested-by: kokoro
---
M util/dockerfiles/ubuntu-18.04_clang-version/Dockerfile
M util/dockerfiles/ubuntu-18.04_gcc-version/Dockerfile
M util/dockerfiles/ubuntu-20.04_gcc-version/Dockerfile
3 files changed, 3 insertions(+), 3 deletions(-)
Approvals:
Jason Lowe-Power: Looks good to me, approved; Looks good to me, approved
Gabe Black: Looks good to me, approved
kokoro: Regressions pass
diff --git a/util/dockerfiles/ubuntu-18.04_clang-version/Dockerfile
b/util/dockerfiles/ubuntu-18.04_clang-version/Dockerfile
index 97f3dbc..869a2c1 100644
--- a/util/dockerfiles/ubuntu-18.04_clang-version/Dockerfile
+++ b/util/dockerfiles/ubuntu-18.04_clang-version/Dockerfile
@@ -40,7 +40,7 @@
RUN apt -y upgrade
RUN apt -y install git m4 scons zlib1g zlib1g-dev clang-${version} \
libprotobuf-dev protobuf-compiler libprotoc-dev
libgoogle-perftools-dev \
-python3-dev python3 python3-six doxygen
+python3-dev python3 python3-six doxygen make
RUN apt-get --purge -y remove gcc
diff --git a/util/dockerfiles/ubuntu-18.04_gcc-version/Dockerfile
b/util/dockerfiles/ubuntu-18.04_gcc-version/Dockerfile
index 9f3da37..1723fd9 100644
--- a/util/dockerfiles/ubuntu-18.04_gcc-version/Dockerfile
+++ b/util/dockerfiles/ubuntu-18.04_gcc-version/Dockerfile
@@ -38,7 +38,7 @@
RUN apt -y install git m4 scons zlib1g zlib1g-dev gcc-multilib \
libprotobuf-dev protobuf-compiler libprotoc-dev
libgoogle-perftools-dev \
python3-dev python3 python3-six doxygen wget zip gcc-${version} \
-g++-${version}
+g++-${version} make
RUN update-alternatives --install \
/usr/bin/g++ g++ /usr/bin/g++-${version} 100
diff --git a/util/dockerfiles/ubuntu-20.04_gcc-version/Dockerfile
b/util/dockerfiles/ubuntu-20.04_gcc-version/Dockerfile
index d2008b6..923fe63 100644
--- a/util/dockerfiles/ubuntu-20.04_gcc-version/Dockerfile
+++ b/util/dockerfiles/ubuntu-20.04_gcc-version/Dockerfile
@@ -38,7 +38,7 @@
RUN apt -y install git m4 scons zlib1g zlib1g-dev libprotobuf-dev \
protobuf-compiler libprotoc-dev libgoogle-perftools-dev python3-dev \
python3-six python-is-python3 doxygen libboost-all-dev
libhdf5-serial-dev \
-python3-pydot libpng-dev gcc-${version} g++-${version}
+python3-pydot libpng-dev gcc-${version} g++-${version} make
RUN update-alternatives --install \
/usr/bin/g++ g++ /usr/bin/g++-${version} 100
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/41873
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: Id5552aaa295e194789ab5f355bb62a3657384d38
Gerrit-Change-Number: 41873
Gerrit-PatchSet: 2
Gerrit-Owner: Bobby R. Bruce
Gerrit-Reviewer: Bobby R. Bruce
Gerrit-Reviewer: Gabe Black
Gerrit-Reviewer: Jason Lowe-Power
Gerrit-Reviewer: Jason Lowe-Power
Gerrit-Reviewer: kokoro
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
[gem5-dev] Change in gem5/gem5[develop]: arch-riscv,misc: Add missing overrides for clang compilation
Bobby R. Bruce has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/41913 )
Change subject: arch-riscv,misc: Add missing overrides for clang compilation
..
arch-riscv,misc: Add missing overrides for clang compilation
The Clang compiler returns "missing override" errors without these.
Change-Id: I62af6c338b000123c924f0b3205551579bd5aeb4
---
M src/arch/riscv/isa.hh
M src/dev/riscv/clint.hh
M src/dev/riscv/rtc.hh
3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/arch/riscv/isa.hh b/src/arch/riscv/isa.hh
index 1c5dac3..7f03a17 100644
--- a/src/arch/riscv/isa.hh
+++ b/src/arch/riscv/isa.hh
@@ -97,8 +97,8 @@
bool inUserMode() const override { return true; }
-void serialize(CheckpointOut ) const;
-void unserialize(CheckpointIn );
+void serialize(CheckpointOut ) const override;
+void unserialize(CheckpointIn ) override;
ISA(const Params );
};
diff --git a/src/dev/riscv/clint.hh b/src/dev/riscv/clint.hh
index 7b1745c..1f213ce 100644
--- a/src/dev/riscv/clint.hh
+++ b/src/dev/riscv/clint.hh
@@ -139,7 +139,8 @@
* SimObject functions
*/
void init() override;
-Port & getPort(const std::string _name, PortID idx=InvalidPortID);
+Port & getPort(const std::string _name,
+ PortID idx=InvalidPortID) override;
void serialize(CheckpointOut ) const override;
void unserialize(CheckpointIn ) override;
diff --git a/src/dev/riscv/rtc.hh b/src/dev/riscv/rtc.hh
index bfd9071..42a2d29 100644
--- a/src/dev/riscv/rtc.hh
+++ b/src/dev/riscv/rtc.hh
@@ -70,9 +70,10 @@
RiscvRTC(const Params );
-Port & getPort(const std::string _name, PortID idx=InvalidPortID);
+Port & getPort(const std::string _name,
+ PortID idx=InvalidPortID) override;
-void startup();
+void startup() override;
void serialize(CheckpointOut ) const override;
void unserialize(CheckpointIn ) override;
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/41913
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: I62af6c338b000123c924f0b3205551579bd5aeb4
Gerrit-Change-Number: 41913
Gerrit-PatchSet: 1
Gerrit-Owner: Bobby R. Bruce
Gerrit-MessageType: newchange
___
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
[gem5-dev] Change in gem5/gem5[develop]: misc: Adding 'make' to the compiler Dockerfiles
Bobby R. Bruce has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/41873 )
Change subject: misc: Adding 'make' to the compiler Dockerfiles
..
misc: Adding 'make' to the compiler Dockerfiles
While gem5 will compile without make, LTO cannot link on multiple
threads without it.
Change-Id: Id5552aaa295e194789ab5f355bb62a3657384d38
---
M util/dockerfiles/ubuntu-18.04_clang-version/Dockerfile
M util/dockerfiles/ubuntu-18.04_gcc-version/Dockerfile
M util/dockerfiles/ubuntu-20.04_gcc-version/Dockerfile
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/util/dockerfiles/ubuntu-18.04_clang-version/Dockerfile
b/util/dockerfiles/ubuntu-18.04_clang-version/Dockerfile
index 97f3dbc..869a2c1 100644
--- a/util/dockerfiles/ubuntu-18.04_clang-version/Dockerfile
+++ b/util/dockerfiles/ubuntu-18.04_clang-version/Dockerfile
@@ -40,7 +40,7 @@
RUN apt -y upgrade
RUN apt -y install git m4 scons zlib1g zlib1g-dev clang-${version} \
libprotobuf-dev protobuf-compiler libprotoc-dev
libgoogle-perftools-dev \
-python3-dev python3 python3-six doxygen
+python3-dev python3 python3-six doxygen make
RUN apt-get --purge -y remove gcc
diff --git a/util/dockerfiles/ubuntu-18.04_gcc-version/Dockerfile
b/util/dockerfiles/ubuntu-18.04_gcc-version/Dockerfile
index 9f3da37..1723fd9 100644
--- a/util/dockerfiles/ubuntu-18.04_gcc-version/Dockerfile
+++ b/util/dockerfiles/ubuntu-18.04_gcc-version/Dockerfile
@@ -38,7 +38,7 @@
RUN apt -y install git m4 scons zlib1g zlib1g-dev gcc-multilib \
libprotobuf-dev protobuf-compiler libprotoc-dev
libgoogle-perftools-dev \
python3-dev python3 python3-six doxygen wget zip gcc-${version} \
-g++-${version}
+g++-${version} make
RUN update-alternatives --install \
/usr/bin/g++ g++ /usr/bin/g++-${version} 100
diff --git a/util/dockerfiles/ubuntu-20.04_gcc-version/Dockerfile
b/util/dockerfiles/ubuntu-20.04_gcc-version/Dockerfile
index d2008b6..923fe63 100644
--- a/util/dockerfiles/ubuntu-20.04_gcc-version/Dockerfile
+++ b/util/dockerfiles/ubuntu-20.04_gcc-version/Dockerfile
@@ -38,7 +38,7 @@
RUN apt -y install git m4 scons zlib1g zlib1g-dev libprotobuf-dev \
protobuf-compiler libprotoc-dev libgoogle-perftools-dev python3-dev \
python3-six python-is-python3 doxygen libboost-all-dev
libhdf5-serial-dev \
-python3-pydot libpng-dev gcc-${version} g++-${version}
+python3-pydot libpng-dev gcc-${version} g++-${version} make
RUN update-alternatives --install \
/usr/bin/g++ g++ /usr/bin/g++-${version} 100
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/41873
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: Id5552aaa295e194789ab5f355bb62a3657384d38
Gerrit-Change-Number: 41873
Gerrit-PatchSet: 1
Gerrit-Owner: Bobby R. Bruce
Gerrit-MessageType: newchange
___
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
[gem5-dev] Change in gem5/gem5[develop]: base-stats: Fixed System "work_item" stat name
Bobby R. Bruce has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/41833 )
Change subject: base-stats: Fixed System "work_item" stat name
..
base-stats: Fixed System "work_item" stat name
The name of this stat was prefixed with 'system.'. Something which is
unecessary and undesirable for the stats output.
Change-Id: I873a77927e1ae6bb52f66e9c935e91ef43649dcd
---
M src/sim/system.cc
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/sim/system.cc b/src/sim/system.cc
index 93902af..4a9c6cd 100644
--- a/src/sim/system.cc
+++ b/src/sim/system.cc
@@ -483,7 +483,7 @@
std::stringstream namestr;
ccprintf(namestr, "work_item_type%d", j);
workItemStats[j]->init(20)
- .name(name() + "." + namestr.str())
+ .name(namestr.str())
.desc("Run time stat for" + namestr.str())
.prereq(*workItemStats[j]);
}
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/41833
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: I873a77927e1ae6bb52f66e9c935e91ef43649dcd
Gerrit-Change-Number: 41833
Gerrit-PatchSet: 1
Gerrit-Owner: Bobby R. Bruce
Gerrit-MessageType: newchange
___
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
[gem5-dev] Change in gem5/gem5[hotfix-scons-4]: misc: Updated the RELEASE-NOTES and version number
Bobby R. Bruce has submitted this change. ( https://gem5-review.googlesource.com/c/public/gem5/+/41713 ) Change subject: misc: Updated the RELEASE-NOTES and version number .. misc: Updated the RELEASE-NOTES and version number Updated the RELEASE-NOTES.md and version number for the v20.1.0.3 hotfix release. Change-Id: Iaefed86cb176c3adcd66d101ac3155d30528b025 Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/41713 Maintainer: Bobby R. Bruce Reviewed-by: Jason Lowe-Power Reviewed-by: Hoa Nguyen Tested-by: kokoro --- M RELEASE-NOTES.md M src/Doxyfile M src/base/version.cc 3 files changed, 7 insertions(+), 2 deletions(-) Approvals: Jason Lowe-Power: Looks good to me, approved Hoa Nguyen: Looks good to me, approved Bobby R. Bruce: Looks good to me, approved kokoro: Regressions pass diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md index c84d9b4..3f17091 100644 --- a/RELEASE-NOTES.md +++ b/RELEASE-NOTES.md @@ -1,3 +1,8 @@ +# Version 20.1.0.4 + +**[HOTFIX]** [gem5 was failing to build with SCons 4.0.1 and 4.1.0](https://gem5.atlassian.net/browse/GEM5-916). +This hotfix makes the necessary changes to `site_scons/site_tools/default.py` for gem5 to compile successfully on these versions of SCons. + # Version 20.1.0.3 **[HOTFIX]** A patch was apply to fix an [error where booting Linux stalled when using the ARM ISA](https://gem5.atlassian.net/browse/GEM5-901). diff --git a/src/Doxyfile b/src/Doxyfile index ddc3933..4ad0ea5 100644 --- a/src/Doxyfile +++ b/src/Doxyfile @@ -31,7 +31,7 @@ # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = v20.1.0.3 +PROJECT_NUMBER = v20.1.0.4 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # base path where the generated documentation will be put. diff --git a/src/base/version.cc b/src/base/version.cc index d30ddd1..0a34488 100644 --- a/src/base/version.cc +++ b/src/base/version.cc @@ -29,4 +29,4 @@ /** * @ingroup api_base_utils */ -const char *gem5Version = "20.1.0.3"; +const char *gem5Version = "20.1.0.4"; -- To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/41713 To unsubscribe, or for help writing mail filters, visit https://gem5-review.googlesource.com/settings Gerrit-Project: public/gem5 Gerrit-Branch: hotfix-scons-4 Gerrit-Change-Id: Iaefed86cb176c3adcd66d101ac3155d30528b025 Gerrit-Change-Number: 41713 Gerrit-PatchSet: 2 Gerrit-Owner: Bobby R. Bruce Gerrit-Reviewer: Bobby R. Bruce Gerrit-Reviewer: Hoa Nguyen Gerrit-Reviewer: Jason Lowe-Power Gerrit-Reviewer: Jason Lowe-Power Gerrit-Reviewer: kokoro 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
[gem5-dev] Change in gem5/gem5[hotfix-scons-4]: scons: Fixing build errors with scons 4.0.1 and 4.1.0
Bobby R. Bruce has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/41594 )
Change subject: scons: Fixing build errors with scons 4.0.1 and 4.1.0
..
scons: Fixing build errors with scons 4.0.1 and 4.1.0
SCons failed to find m5 module while loading m5.util.terminal
from site_scons/gem5_scons/util.py.
This results in the current version of gem5 stable failed to
build with scons 4.0.1 and 4.1.0.
The nature of the bug and the explaination for the fix can be
found here,
https://gem5-review.googlesource.com/c/public/gem5/+/38616
Jira: https://gem5.atlassian.net/browse/GEM5-916
Change-Id: I3817f39ebc3021fb6fc89bcd09a96999f8ca2841
Signed-off-by: Hoa Nguyen
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/41594
Reviewed-by: Bobby R. Bruce
Maintainer: Bobby R. Bruce
Tested-by: kokoro
---
M SConstruct
M site_scons/site_tools/default.py
2 files changed, 1 insertion(+), 7 deletions(-)
Approvals:
Bobby R. Bruce: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/SConstruct b/SConstruct
index 0d8159b..bb038b8 100755
--- a/SConstruct
+++ b/SConstruct
@@ -139,7 +139,7 @@
#
-main = Environment()
+main = Environment(tools=['default', 'git'])
from gem5_scons.util import get_termcap
termcap = get_termcap()
diff --git a/site_scons/site_tools/default.py
b/site_scons/site_tools/default.py
index 1965a20..88a6932 100644
--- a/site_scons/site_tools/default.py
+++ b/site_scons/site_tools/default.py
@@ -78,15 +78,9 @@
# as well
env.AppendENVPath('PYTHONPATH', extra_python_paths)
-gem5_tool_list = [
-'git',
-]
-
def generate(env):
common_config(env)
SCons.Tool.default.generate(env)
-for tool in gem5_tool_list:
-SCons.Tool.Tool(tool)(env)
def exists(env):
return 1
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/41594
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: hotfix-scons-4
Gerrit-Change-Id: I3817f39ebc3021fb6fc89bcd09a96999f8ca2841
Gerrit-Change-Number: 41594
Gerrit-PatchSet: 4
Gerrit-Owner: Hoa Nguyen
Gerrit-Reviewer: Bobby R. Bruce
Gerrit-Reviewer: Gabe Black
Gerrit-Reviewer: kokoro
Gerrit-CC: Jason Lowe-Power
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
[gem5-dev] Change in gem5/gem5[develop]: base-stats,python: Add Units to the Python Stats
Bobby R. Bruce has uploaded this change for review. ( https://gem5-review.googlesource.com/c/public/gem5/+/41754 ) Change subject: base-stats,python: Add Units to the Python Stats .. base-stats,python: Add Units to the Python Stats Change-Id: Ic8d3c9a5c2bb7fbe51b8672b74b0e5fb17906a5e --- M src/python/m5/pystats/loader.py 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/python/m5/pystats/loader.py b/src/python/m5/pystats/loader.py index aae223d..84bc884 100644 --- a/src/python/m5/pystats/loader.py +++ b/src/python/m5/pystats/loader.py @@ -104,7 +104,7 @@ def __get_scaler(statistic: _m5.stats.ScalarInfo) -> Scalar: value = statistic.value -unit = None # TODO https://gem5.atlassian.net/browse/GEM5-850. +unit = statistic.unit description = statistic.desc # ScalarInfo uses the C++ `double`. datatype = StorageType["f64"] @@ -117,7 +117,7 @@ ) def __get_distribution(statistic: _m5.stats.DistInfo) -> Distribution: -unit = None # TODO https://gem5.atlassian.net/browse/GEM5-850. +unit = statistic.unit description = statistic.desc value = statistic.values bin_size = statistic.bucket_size @@ -154,7 +154,7 @@ for index in range(statistic.size): # All the values in a Vector are Scalar values value = statistic.value[index] -unit = None # TODO https://gem5.atlassian.net/browse/GEM5-850. +unit = statistic.unit description = statistic.subdescs[index] # ScalarInfo uses the C++ `double`. datatype = StorageType["f64"] -- To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/41754 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: Ic8d3c9a5c2bb7fbe51b8672b74b0e5fb17906a5e Gerrit-Change-Number: 41754 Gerrit-PatchSet: 1 Gerrit-Owner: Bobby R. Bruce Gerrit-MessageType: newchange ___ 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
[gem5-dev] Change in gem5/gem5[develop]: base-stats,python: Expose a stat's unit via PyBind11
Bobby R. Bruce has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/41753 )
Change subject: base-stats,python: Expose a stat's unit via PyBind11
..
base-stats,python: Expose a stat's unit via PyBind11
Change-Id: I77df868a6bc92e5bb0a39592b5aca8e0d259bb05
---
M src/python/pybind11/stats.cc
1 file changed, 3 insertions(+), 0 deletions(-)
diff --git a/src/python/pybind11/stats.cc b/src/python/pybind11/stats.cc
index 1e6773f..f1b1e9c 100644
--- a/src/python/pybind11/stats.cc
+++ b/src/python/pybind11/stats.cc
@@ -132,6 +132,9 @@
py::class_>(
m, "Info")
.def_readwrite("name", ::Info::name)
+.def_property_readonly("unit", [](const Stats::Info ) {
+return info.unit->getUnitString();
+})
.def_readonly("desc", ::Info::desc)
.def_readonly("id", ::Info::id)
.def_property_readonly("flags", [](const Stats::Info ) {
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/41753
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: I77df868a6bc92e5bb0a39592b5aca8e0d259bb05
Gerrit-Change-Number: 41753
Gerrit-PatchSet: 1
Gerrit-Owner: Bobby R. Bruce
Gerrit-MessageType: newchange
___
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
[gem5-dev] Change in gem5/gem5[develop]: base-stats,python: Update PyBind11 ScalarInfo fields to readonly
Bobby R. Bruce has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/41693 )
Change subject: base-stats,python: Update PyBind11 ScalarInfo fields to
readonly
..
base-stats,python: Update PyBind11 ScalarInfo fields to readonly
This change keeps the ScalarInfo class consistent with the other Info
classes exposed via PyBind11.
Change-Id: I4d420d509e4654de844e75f58aeaaf67109775d3
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/41693
Reviewed-by: Jason Lowe-Power
Maintainer: Jason Lowe-Power
Tested-by: kokoro
---
M src/python/pybind11/stats.cc
1 file changed, 9 insertions(+), 3 deletions(-)
Approvals:
Jason Lowe-Power: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/python/pybind11/stats.cc b/src/python/pybind11/stats.cc
index e6912e2..1e6773f 100644
--- a/src/python/pybind11/stats.cc
+++ b/src/python/pybind11/stats.cc
@@ -149,9 +149,15 @@
py::class_>(
m, "ScalarInfo")
-.def("value", ::ScalarInfo::value)
-.def("result", ::ScalarInfo::result)
-.def("total", ::ScalarInfo::total)
+.def_property_readonly("value", [](const Stats::ScalarInfo ) {
+return info.value();
+})
+.def_property_readonly("result", [](const Stats::ScalarInfo )
{
+return info.result();
+})
+.def_property_readonly("total", [](const Stats::ScalarInfo ) {
+return info.total();
+})
;
py::class_https://gem5-review.googlesource.com/c/public/gem5/+/41693
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: I4d420d509e4654de844e75f58aeaaf67109775d3
Gerrit-Change-Number: 41693
Gerrit-PatchSet: 2
Gerrit-Owner: Bobby R. Bruce
Gerrit-Reviewer: Andreas Sandberg
Gerrit-Reviewer: Bobby R. Bruce
Gerrit-Reviewer: Jason Lowe-Power
Gerrit-Reviewer: Jason Lowe-Power
Gerrit-Reviewer: kokoro
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
[gem5-dev] Change in gem5/gem5[develop]: base-stats,python: Expose DistInfo via Pybind11
Bobby R. Bruce has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/39298 )
Change subject: base-stats,python: Expose DistInfo via Pybind11
..
base-stats,python: Expose DistInfo via Pybind11
Change-Id: If3ac9a0da52b929559e3cde3c2bab95b59ab16ce
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/39298
Reviewed-by: Jason Lowe-Power
Maintainer: Jason Lowe-Power
Tested-by: kokoro
---
M src/python/pybind11/stats.cc
1 file changed, 33 insertions(+), 0 deletions(-)
Approvals:
Jason Lowe-Power: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/python/pybind11/stats.cc b/src/python/pybind11/stats.cc
index 5d52872..d07ccbf 100644
--- a/src/python/pybind11/stats.cc
+++ b/src/python/pybind11/stats.cc
@@ -67,6 +67,7 @@
} while (0)
TRY_CAST(Stats::ScalarInfo);
+TRY_CAST(Stats::DistInfo);
return py::cast(info);
@@ -147,6 +148,38 @@
.def("total", ::ScalarInfo::total)
;
+py::class_>(
+m, "DistInfo")
+.def_property_readonly("min_val", [](const Stats::DistInfo ) {
+return info.data.min_val;
+})
+.def_property_readonly("max_val", [](const Stats::DistInfo ) {
+return info.data.max_val;
+})
+.def_property_readonly("bucket_size", [](const Stats::DistInfo
) {
+return info.data.bucket_size;
+})
+.def_property_readonly("values", [](const Stats::DistInfo ) {
+return info.data.cvec;
+})
+.def_property_readonly("overflow", [](const Stats::DistInfo )
{
+return info.data.overflow;
+})
+.def_property_readonly("underflow", [](const Stats::DistInfo
) {
+return info.data.underflow;
+})
+.def_property_readonly("sum", [](const Stats::DistInfo ) {
+return info.data.sum;
+})
+.def_property_readonly("logs", [](const Stats::DistInfo ) {
+return info.data.logs;
+})
+.def_property_readonly("squares", [](const Stats::DistInfo ) {
+return info.data.squares;
+})
+;
+
py::class_>(
m, "Group")
.def("regStats", ::Group::regStats)
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/39298
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: If3ac9a0da52b929559e3cde3c2bab95b59ab16ce
Gerrit-Change-Number: 39298
Gerrit-PatchSet: 5
Gerrit-Owner: Bobby R. Bruce
Gerrit-Reviewer: Andreas Sandberg
Gerrit-Reviewer: Bobby R. Bruce
Gerrit-Reviewer: Ciro Santilli
Gerrit-Reviewer: Jason Lowe-Power
Gerrit-Reviewer: Jason Lowe-Power
Gerrit-Reviewer: kokoro
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
[gem5-dev] Change in gem5/gem5[develop]: base-stats,python: Expose VectorInfo via Pybind11
Bobby R. Bruce has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/39299 )
Change subject: base-stats,python: Expose VectorInfo via Pybind11
..
base-stats,python: Expose VectorInfo via Pybind11
Change-Id: Iba5fd1dfd1e4c35f01bf4a6fc28481c1be3dd028
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/39299
Reviewed-by: Jason Lowe-Power
Maintainer: Jason Lowe-Power
Tested-by: kokoro
---
M src/python/pybind11/stats.cc
1 file changed, 20 insertions(+), 0 deletions(-)
Approvals:
Jason Lowe-Power: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/python/pybind11/stats.cc b/src/python/pybind11/stats.cc
index d07ccbf..50013cf 100644
--- a/src/python/pybind11/stats.cc
+++ b/src/python/pybind11/stats.cc
@@ -67,6 +67,7 @@
} while (0)
TRY_CAST(Stats::ScalarInfo);
+TRY_CAST(Stats::VectorInfo);
TRY_CAST(Stats::DistInfo);
return py::cast(info);
@@ -148,6 +149,25 @@
.def("total", ::ScalarInfo::total)
;
+py::class_>(
+m, "VectorInfo")
+.def_readwrite("subnames", ::VectorInfo::subnames)
+.def_readwrite("subdescs", ::VectorInfo::subdescs)
+.def_property_readonly("size", [](const Stats::VectorInfo ) {
+return info.size();
+})
+.def_property_readonly("value", [](const Stats::VectorInfo ) {
+return info.value();
+})
+.def_property_readonly("result", [](const Stats::VectorInfo )
{
+return info.result();
+})
+.def_property_readonly("total", [](const Stats::VectorInfo ) {
+return info.total();
+})
+;
+
py::class_>(
m, "DistInfo")
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/39299
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: Iba5fd1dfd1e4c35f01bf4a6fc28481c1be3dd028
Gerrit-Change-Number: 39299
Gerrit-PatchSet: 5
Gerrit-Owner: Bobby R. Bruce
Gerrit-Reviewer: Andreas Sandberg
Gerrit-Reviewer: Bobby R. Bruce
Gerrit-Reviewer: Ciro Santilli
Gerrit-Reviewer: Jason Lowe-Power
Gerrit-Reviewer: Jason Lowe-Power
Gerrit-Reviewer: kokoro
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
[gem5-dev] Change in gem5/gem5[develop]: base-stats,python: Expose FormulaInfo via PyBind11
Bobby R. Bruce has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/39300 )
Change subject: base-stats,python: Expose FormulaInfo via PyBind11
..
base-stats,python: Expose FormulaInfo via PyBind11
Change-Id: If7d3e7a386e138d5f4e05bb1ec4b920d6caef836
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/39300
Reviewed-by: Jason Lowe-Power
Maintainer: Jason Lowe-Power
Tested-by: kokoro
---
M src/python/pybind11/stats.cc
1 file changed, 13 insertions(+), 0 deletions(-)
Approvals:
Jason Lowe-Power: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/python/pybind11/stats.cc b/src/python/pybind11/stats.cc
index 50013cf..e6912e2 100644
--- a/src/python/pybind11/stats.cc
+++ b/src/python/pybind11/stats.cc
@@ -67,6 +67,11 @@
} while (0)
TRY_CAST(Stats::ScalarInfo);
+/* FormulaInfo is a subclass of VectorInfo. Therefore, a cast to
+ * FormulaInfo must be attempted before a cast to VectorInfo. Otherwise
+ * instances of ForumlaInfo will be cast to VectorInfo.
+ */
+TRY_CAST(Stats::FormulaInfo);
TRY_CAST(Stats::VectorInfo);
TRY_CAST(Stats::DistInfo);
@@ -168,6 +173,14 @@
})
;
+py::class_>(
+ m, "FormulaInfo")
+.def_property_readonly("str", [](const Stats::FormulaInfo ) {
+return info.str();
+})
+;
+
py::class_>(
m, "DistInfo")
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/39300
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: If7d3e7a386e138d5f4e05bb1ec4b920d6caef836
Gerrit-Change-Number: 39300
Gerrit-PatchSet: 6
Gerrit-Owner: Bobby R. Bruce
Gerrit-Reviewer: Andreas Sandberg
Gerrit-Reviewer: Bobby R. Bruce
Gerrit-Reviewer: Ciro Santilli
Gerrit-Reviewer: Jason Lowe-Power
Gerrit-Reviewer: Jason Lowe-Power
Gerrit-Reviewer: kokoro
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
[gem5-dev] Change in gem5/gem5[develop]: misc: Updated the RELEASE-NOTES and version number
Bobby R. Bruce has uploaded this change for review. ( https://gem5-review.googlesource.com/c/public/gem5/+/41713 ) Change subject: misc: Updated the RELEASE-NOTES and version number .. misc: Updated the RELEASE-NOTES and version number Updated the RELEASE-NOTES.md and version number for the v20.1.0.3 hotfix release. Change-Id: Iaefed86cb176c3adcd66d101ac3155d30528b025 --- M RELEASE-NOTES.md M src/Doxyfile M src/base/version.cc 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md index c84d9b4..3f17091 100644 --- a/RELEASE-NOTES.md +++ b/RELEASE-NOTES.md @@ -1,3 +1,8 @@ +# Version 20.1.0.4 + +**[HOTFIX]** [gem5 was failing to build with SCons 4.0.1 and 4.1.0](https://gem5.atlassian.net/browse/GEM5-916). +This hotfix makes the necessary changes to `site_scons/site_tools/default.py` for gem5 to compile successfully on these versions of SCons. + # Version 20.1.0.3 **[HOTFIX]** A patch was apply to fix an [error where booting Linux stalled when using the ARM ISA](https://gem5.atlassian.net/browse/GEM5-901). diff --git a/src/Doxyfile b/src/Doxyfile index ddc3933..4ad0ea5 100644 --- a/src/Doxyfile +++ b/src/Doxyfile @@ -31,7 +31,7 @@ # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = v20.1.0.3 +PROJECT_NUMBER = v20.1.0.4 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # base path where the generated documentation will be put. diff --git a/src/base/version.cc b/src/base/version.cc index d30ddd1..0a34488 100644 --- a/src/base/version.cc +++ b/src/base/version.cc @@ -29,4 +29,4 @@ /** * @ingroup api_base_utils */ -const char *gem5Version = "20.1.0.3"; +const char *gem5Version = "20.1.0.4"; -- To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/41713 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: Iaefed86cb176c3adcd66d101ac3155d30528b025 Gerrit-Change-Number: 41713 Gerrit-PatchSet: 1 Gerrit-Owner: Bobby R. Bruce Gerrit-MessageType: newchange ___ 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
[gem5-dev] Change in gem5/gem5[develop]: base-stats,python: Update PyBind11 ScalarInfo fields to readonly
Bobby R. Bruce has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/41693 )
Change subject: base-stats,python: Update PyBind11 ScalarInfo fields to
readonly
..
base-stats,python: Update PyBind11 ScalarInfo fields to readonly
This change keeps the ScalarInfo class consistent with the other Info
classes exposed via PyBind11.
Change-Id: I4d420d509e4654de844e75f58aeaaf67109775d3
---
M src/python/pybind11/stats.cc
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/python/pybind11/stats.cc b/src/python/pybind11/stats.cc
index e6912e2..1e6773f 100644
--- a/src/python/pybind11/stats.cc
+++ b/src/python/pybind11/stats.cc
@@ -149,9 +149,15 @@
py::class_>(
m, "ScalarInfo")
-.def("value", ::ScalarInfo::value)
-.def("result", ::ScalarInfo::result)
-.def("total", ::ScalarInfo::total)
+.def_property_readonly("value", [](const Stats::ScalarInfo ) {
+return info.value();
+})
+.def_property_readonly("result", [](const Stats::ScalarInfo )
{
+return info.result();
+})
+.def_property_readonly("total", [](const Stats::ScalarInfo ) {
+return info.total();
+})
;
py::class_https://gem5-review.googlesource.com/c/public/gem5/+/41693
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: I4d420d509e4654de844e75f58aeaaf67109775d3
Gerrit-Change-Number: 41693
Gerrit-PatchSet: 1
Gerrit-Owner: Bobby R. Bruce
Gerrit-MessageType: newchange
___
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
[gem5-dev] Change in gem5/gem5[develop]: base-stats,python: Output Pystats to m5out/stats.json by default
Bobby R. Bruce has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/41514 )
Change subject: base-stats,python: Output Pystats to m5out/stats.json by
default
..
base-stats,python: Output Pystats to m5out/stats.json by default
Change-Id: I37d7155f9875a6f6c0c56fead027fdfc658d1b81
---
M src/python/m5/main.py
M src/python/m5/simulate.py
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/src/python/m5/main.py b/src/python/m5/main.py
index 9342ad0..94abf8e 100644
--- a/src/python/m5/main.py
+++ b/src/python/m5/main.py
@@ -112,7 +112,9 @@
# Statistics options
group("Statistics Options")
option("--stats-file", metavar="FILE", default="stats.txt",
-help="Sets the output file for statistics [Default: %default]")
+help="Sets the output text file for statistics
[Default: %default]")
+option("--stats-json", metavar="FILE", default="stats.json",
+help="Sets the output JSON file for statistics
[Default: %default]")
option("--stats-help",
action="callback", callback=_stats_help,
help="Display documentation for available stat visitors")
diff --git a/src/python/m5/simulate.py b/src/python/m5/simulate.py
index a1a05dc..a514927 100644
--- a/src/python/m5/simulate.py
+++ b/src/python/m5/simulate.py
@@ -45,6 +45,7 @@
import _m5.drain
import _m5.core
from _m5.stats import updateEvents as updateStatEvents
+import m5.pystats.loader as loader
from . import stats
from . import SimObject
@@ -153,6 +154,7 @@
need_startup = True
def simulate(*args, **kwargs):
+from m5 import options
global need_startup
if need_startup:
@@ -181,6 +183,10 @@
sys.stdout.flush()
sys.stderr.flush()
+if options.stats_json:
+with open(os.path.join(options.outdir, options.stats_json), 'w')
as f:
+loader.get_simstat(root).dump(f)
+
return sim_out
def drain():
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/41514
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: I37d7155f9875a6f6c0c56fead027fdfc658d1b81
Gerrit-Change-Number: 41514
Gerrit-PatchSet: 1
Gerrit-Owner: Bobby R. Bruce
Gerrit-MessageType: newchange
___
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
[gem5-dev] Change in gem5/gem5[develop]: sim,base-stats: Fix leading "." bug when obtaining requestors
Bobby R. Bruce has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/41513 )
Change subject: sim,base-stats: Fix leading "." bug when obtaining
requestors
..
sim,base-stats: Fix leading "." bug when obtaining requestors
When requestor id is requested, it is stripped of the System name via
the `stripSystemName` function in `system.cc`. However, there is a bug
in this code that leaves a leading ".". E.g.:
`system.cpu.mmu.dtb.walker` is stripped to `.cpu.mmu.dtb.walker`.
This patch fixes this issue.
Change-Id: I825cbc60c7f7eaa84c8a0150c30e9f2902cff6cb
---
M src/sim/system.cc
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/sim/system.cc b/src/sim/system.cc
index bb3c0be..5182ef5 100644
--- a/src/sim/system.cc
+++ b/src/sim/system.cc
@@ -533,7 +533,7 @@
System::stripSystemName(const std::string& requestor_name) const
{
if (startswith(requestor_name, name())) {
-return requestor_name.substr(name().size());
+return requestor_name.substr(name().size() + 1);
} else {
return requestor_name;
}
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/41513
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: I825cbc60c7f7eaa84c8a0150c30e9f2902cff6cb
Gerrit-Change-Number: 41513
Gerrit-PatchSet: 1
Gerrit-Owner: Bobby R. Bruce
Gerrit-MessageType: newchange
___
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
[gem5-dev] Change in gem5/gem5[develop]: tests: Update the presubit.sh to pull the latest Docker iamges
Bobby R. Bruce has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/41374 )
Change subject: tests: Update the presubit.sh to pull the latest Docker
iamges
..
tests: Update the presubit.sh to pull the latest Docker iamges
Change-Id: I6a7ad32ba44f73590d7871da6881b7b42ec3f9ee
---
M tests/jenkins/presubmit.sh
1 file changed, 4 insertions(+), 0 deletions(-)
diff --git a/tests/jenkins/presubmit.sh b/tests/jenkins/presubmit.sh
index f27c23c..f881cc1 100755
--- a/tests/jenkins/presubmit.sh
+++ b/tests/jenkins/presubmit.sh
@@ -47,6 +47,10 @@
sudo ln -s /tmpfs/docker /var/lib/docker
sudo /etc/init.d/docker start
+# Pull the latest docker images.
+docker pull ${DOCKER_IMAGE_ALL_DEP}
+docker pull ${DOCKER_IMAGE_CLANG_COMPILE}
+
# Move the CWD to the gem5 checkout.
cd git/jenkins-gem5-prod/
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/41374
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: I6a7ad32ba44f73590d7871da6881b7b42ec3f9ee
Gerrit-Change-Number: 41374
Gerrit-PatchSet: 1
Gerrit-Owner: Bobby R. Bruce
Gerrit-MessageType: newchange
___
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
[gem5-dev] Change in gem5/gem5[develop]: tests: Mock commit to test the presubmit.sh docker images
Bobby R. Bruce has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/41373 )
Change subject: tests: Mock commit to test the presubmit.sh docker images
..
tests: Mock commit to test the presubmit.sh docker images
DO NOT COMMIT!!!
Change-Id: Ie90eb5e587701de14f18f1f3b1e05966e576e33b
---
M tests/jenkins/presubmit.sh
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/tests/jenkins/presubmit.sh b/tests/jenkins/presubmit.sh
index f27c23c..9605af6 100755
--- a/tests/jenkins/presubmit.sh
+++ b/tests/jenkins/presubmit.sh
@@ -51,8 +51,8 @@
cd git/jenkins-gem5-prod/
# Using a docker image with all the dependencies, we run the presubmit
tests.
-docker run -u $UID:$GID --volume $(pwd):$(pwd) -w $(pwd) --rm \
-"${DOCKER_IMAGE_ALL_DEP}" "${PRESUBMIT_STAGE2}"
+#docker run -u $UID:$GID --volume $(pwd):$(pwd) -w $(pwd) --rm \
+#"${DOCKER_IMAGE_ALL_DEP}" "${PRESUBMIT_STAGE2}"
# DOCKER_IMAGE_ALL_DEP compiles gem5.opt with GCC. We run a compilation of
# gem5.fast on the Clang compiler to ensure changes are compilable with the
@@ -61,5 +61,5 @@
# "Compiler Checks" tests: http://jenkins.gem5.org/job/Compiler-Checks.
rm -rf build
docker run -u $UID:$GID --volume $(pwd):$(pwd) -w $(pwd) --rm \
-"${DOCKER_IMAGE_CLANG_COMPILE}" /usr/bin/env python3 /usr/bin/scons \
-build/X86/gem5.fast -j4 --no-compress-debug
+"${DOCKER_IMAGE_CLANG_COMPILE}" python3-config #/usr/bin/env python3
/usr/bin/scons \
+#build/X86/gem5.fast -j4 --no-compress-debug
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/41373
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: Ie90eb5e587701de14f18f1f3b1e05966e576e33b
Gerrit-Change-Number: 41373
Gerrit-PatchSet: 1
Gerrit-Owner: Bobby R. Bruce
Gerrit-MessageType: newchange
___
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
[gem5-dev] Change in gem5/gem5[develop]: misc: Merge branch v20.1.0.3 hotfix into develop
Bobby R. Bruce has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/40535 )
Change subject: misc: Merge branch v20.1.0.3 hotfix into develop
..
misc: Merge branch v20.1.0.3 hotfix into develop
Change-Id: I12cca586627718bf41fe24f0fcd3f10c4fe48b2d
---
M src/Doxyfile
M src/arch/arm/system.cc
M src/base/version.cc
4 files changed, 1 insertion(+), 27 deletions(-)
Approvals:
Bobby R. Bruce: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/Doxyfile b/src/Doxyfile
index 60ca662..ddc3933 100644
--- a/src/Doxyfile
+++ b/src/Doxyfile
@@ -31,11 +31,7 @@
# This could be handy for archiving the generated documentation or
# if some version control system is used.
-<<<<<<< HEAD (758011 scons,python: Fix `--without-python` flag)
-PROJECT_NUMBER = DEVELOP-FOR-V20.2
-===
PROJECT_NUMBER = v20.1.0.3
->>>>>>> BRANCH (cd21b5 misc: Updated the RELEASE-NOTES and version number)
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put.
diff --git a/src/arch/arm/system.cc b/src/arch/arm/system.cc
index 22121e1..783366d 100644
--- a/src/arch/arm/system.cc
+++ b/src/arch/arm/system.cc
@@ -63,7 +63,6 @@
_genericTimer(nullptr),
_gic(nullptr),
_pwrCtrl(nullptr),
-<<<<<<< HEAD (758011 scons,python: Fix `--without-python` flag)
_highestELIs64(p.highest_el_is_64),
_physAddrRange64(p.phys_addr_range_64),
_haveLargeAsid64(p.have_large_asid_64),
@@ -71,30 +70,13 @@
_haveSVE(p.have_sve),
_sveVL(p.sve_vl),
_haveLSE(p.have_lse),
+ _haveVHE(p.have_vhe),
_havePAN(p.have_pan),
_haveSecEL2(p.have_secel2),
semihosting(p.semihosting),
multiProc(p.multi_proc)
-===
- _highestELIs64(p->highest_el_is_64),
- _physAddrRange64(p->phys_addr_range_64),
- _haveLargeAsid64(p->have_large_asid_64),
- _haveTME(p->have_tme),
- _haveSVE(p->have_sve),
- _sveVL(p->sve_vl),
- _haveLSE(p->have_lse),
- _haveVHE(p->have_vhe),
- _havePAN(p->have_pan),
- _haveSecEL2(p->have_secel2),
- semihosting(p->semihosting),
- multiProc(p->multi_proc)
->>>>>>> BRANCH (cd21b5 misc: Updated the RELEASE-NOTES and version number)
{
-<<<<<<< HEAD (758011 scons,python: Fix `--without-python` flag)
if (p.auto_reset_addr) {
-===
- if (p->auto_reset_addr) {
->>>>>>> BRANCH (cd21b5 misc: Updated the RELEASE-NOTES and version number)
_resetAddr = workload->getEntry();
} else {
_resetAddr = p.reset_addr;
diff --git a/src/base/version.cc b/src/base/version.cc
index 59554d3..d30ddd1 100644
--- a/src/base/version.cc
+++ b/src/base/version.cc
@@ -29,8 +29,4 @@
/**
* @ingroup api_base_utils
*/
-<<<<<<< HEAD (758011 scons,python: Fix `--without-python` flag)
-const char *gem5Version = "[DEVELOP-FOR-V20.2]";
-===
const char *gem5Version = "20.1.0.3";
->>>>>>> BRANCH (cd21b5 misc: Updated the RELEASE-NOTES and version number)
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/40535
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: I12cca586627718bf41fe24f0fcd3f10c4fe48b2d
Gerrit-Change-Number: 40535
Gerrit-PatchSet: 1
Gerrit-Owner: Bobby R. Bruce
Gerrit-Reviewer: Bobby R. Bruce
Gerrit-Reviewer: Jason Lowe-Power
Gerrit-Reviewer: kokoro
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
[gem5-dev] Change in gem5/gem5[develop]: misc: Revert version info for develop branch
Bobby R. Bruce has submitted this change. ( https://gem5-review.googlesource.com/c/public/gem5/+/40536 ) Change subject: misc: Revert version info for develop branch .. misc: Revert version info for develop branch Change-Id: Ie01f41cb40b025ef31028bff4d59023e380fcf07 Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/40536 Reviewed-by: Bobby R. Bruce Maintainer: Bobby R. Bruce Tested-by: kokoro --- M src/Doxyfile M src/base/version.cc 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: Bobby R. Bruce: Looks good to me, approved; Looks good to me, approved kokoro: Regressions pass diff --git a/src/Doxyfile b/src/Doxyfile index ddc3933..d453314 100644 --- a/src/Doxyfile +++ b/src/Doxyfile @@ -31,7 +31,7 @@ # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = v20.1.0.3 +PROJECT_NUMBER = DEVELOP-FOR-V20.2 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # base path where the generated documentation will be put. diff --git a/src/base/version.cc b/src/base/version.cc index d30ddd1..cfa98f9 100644 --- a/src/base/version.cc +++ b/src/base/version.cc @@ -29,4 +29,4 @@ /** * @ingroup api_base_utils */ -const char *gem5Version = "20.1.0.3"; +const char *gem5Version = "[DEVELOP-FOR-V20.2]"; -- To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/40536 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: Ie01f41cb40b025ef31028bff4d59023e380fcf07 Gerrit-Change-Number: 40536 Gerrit-PatchSet: 2 Gerrit-Owner: Bobby R. Bruce Gerrit-Reviewer: Bobby R. Bruce Gerrit-Reviewer: Jason Lowe-Power Gerrit-Reviewer: kokoro 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
[gem5-dev] Change in gem5/gem5[develop]: tests: Changed 'long' boot tests to X86 from GCN3_X86
Bobby R. Bruce has submitted this change. ( https://gem5-review.googlesource.com/c/public/gem5/+/40415 ) Change subject: tests: Changed 'long' boot tests to X86 from GCN3_X86 .. tests: Changed 'long' boot tests to X86 from GCN3_X86 We compile GCN3_X86 for the 'quick' tests, as a substitute for X86. We compile X86 as part of our nightly tests, along with the running of the 'long' tests. This leads to a needless duplicate compilation of the X86 isa during our nightly tests. Therefore, this commit removes GCN3_X86 for the 'long' tests (only the x86 boot tests are affected). Change-Id: Ifd8aaf0e7b8178c588ace33b27671d4ba9b353ed Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/40415 Reviewed-by: Jason Lowe-Power Reviewed-by: Matt Sinclair Maintainer: Jason Lowe-Power Maintainer: Matt Sinclair Tested-by: kokoro --- M tests/gem5/x86-boot-tests/test_linux_boot.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jason Lowe-Power: Looks good to me, approved; Looks good to me, approved Matt Sinclair: Looks good to me, approved; Looks good to me, approved kokoro: Regressions pass diff --git a/tests/gem5/x86-boot-tests/test_linux_boot.py b/tests/gem5/x86-boot-tests/test_linux_boot.py index 62f82f9..5422425 100644 --- a/tests/gem5/x86-boot-tests/test_linux_boot.py +++ b/tests/gem5/x86-boot-tests/test_linux_boot.py @@ -60,7 +60,7 @@ '--num-cpus', num_cpus, '--boot-type', boot_type, ], -valid_isas = (constants.gcn3_x86_tag,), +valid_isas = (constants.x86_tag,), valid_hosts = host, length = constants.long_tag, ) -- To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/40415 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: Ifd8aaf0e7b8178c588ace33b27671d4ba9b353ed Gerrit-Change-Number: 40415 Gerrit-PatchSet: 2 Gerrit-Owner: Bobby R. Bruce Gerrit-Reviewer: Bobby R. Bruce Gerrit-Reviewer: Jason Lowe-Power Gerrit-Reviewer: Matt Sinclair Gerrit-Reviewer: kokoro 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
[gem5-dev] Change in gem5/gem5[develop]: misc: Merge branch v20.1.0.3 hotfix into develop
Bobby R. Bruce has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/40535 )
Change subject: misc: Merge branch v20.1.0.3 hotfix into develop
..
misc: Merge branch v20.1.0.3 hotfix into develop
Change-Id: I12cca586627718bf41fe24f0fcd3f10c4fe48b2d
---
M src/Doxyfile
M src/arch/arm/system.cc
M src/base/version.cc
4 files changed, 1 insertion(+), 27 deletions(-)
diff --git a/src/Doxyfile b/src/Doxyfile
index 60ca662..ddc3933 100644
--- a/src/Doxyfile
+++ b/src/Doxyfile
@@ -31,11 +31,7 @@
# This could be handy for archiving the generated documentation or
# if some version control system is used.
-<<<<<<< HEAD (758011 scons,python: Fix `--without-python` flag)
-PROJECT_NUMBER = DEVELOP-FOR-V20.2
-===
PROJECT_NUMBER = v20.1.0.3
->>>>>>> BRANCH (cd21b5 misc: Updated the RELEASE-NOTES and version number)
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put.
diff --git a/src/arch/arm/system.cc b/src/arch/arm/system.cc
index 22121e1..783366d 100644
--- a/src/arch/arm/system.cc
+++ b/src/arch/arm/system.cc
@@ -63,7 +63,6 @@
_genericTimer(nullptr),
_gic(nullptr),
_pwrCtrl(nullptr),
-<<<<<<< HEAD (758011 scons,python: Fix `--without-python` flag)
_highestELIs64(p.highest_el_is_64),
_physAddrRange64(p.phys_addr_range_64),
_haveLargeAsid64(p.have_large_asid_64),
@@ -71,30 +70,13 @@
_haveSVE(p.have_sve),
_sveVL(p.sve_vl),
_haveLSE(p.have_lse),
+ _haveVHE(p.have_vhe),
_havePAN(p.have_pan),
_haveSecEL2(p.have_secel2),
semihosting(p.semihosting),
multiProc(p.multi_proc)
-===
- _highestELIs64(p->highest_el_is_64),
- _physAddrRange64(p->phys_addr_range_64),
- _haveLargeAsid64(p->have_large_asid_64),
- _haveTME(p->have_tme),
- _haveSVE(p->have_sve),
- _sveVL(p->sve_vl),
- _haveLSE(p->have_lse),
- _haveVHE(p->have_vhe),
- _havePAN(p->have_pan),
- _haveSecEL2(p->have_secel2),
- semihosting(p->semihosting),
- multiProc(p->multi_proc)
->>>>>>> BRANCH (cd21b5 misc: Updated the RELEASE-NOTES and version number)
{
-<<<<<<< HEAD (758011 scons,python: Fix `--without-python` flag)
if (p.auto_reset_addr) {
-===
- if (p->auto_reset_addr) {
->>>>>>> BRANCH (cd21b5 misc: Updated the RELEASE-NOTES and version number)
_resetAddr = workload->getEntry();
} else {
_resetAddr = p.reset_addr;
diff --git a/src/base/version.cc b/src/base/version.cc
index 59554d3..d30ddd1 100644
--- a/src/base/version.cc
+++ b/src/base/version.cc
@@ -29,8 +29,4 @@
/**
* @ingroup api_base_utils
*/
-<<<<<<< HEAD (758011 scons,python: Fix `--without-python` flag)
-const char *gem5Version = "[DEVELOP-FOR-V20.2]";
-===
const char *gem5Version = "20.1.0.3";
->>>>>>> BRANCH (cd21b5 misc: Updated the RELEASE-NOTES and version number)
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/40535
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: I12cca586627718bf41fe24f0fcd3f10c4fe48b2d
Gerrit-Change-Number: 40535
Gerrit-PatchSet: 1
Gerrit-Owner: Bobby R. Bruce
Gerrit-MessageType: newchange
___
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
[gem5-dev] Change in gem5/gem5[develop]: misc: Revert version info for develop branch
Bobby R. Bruce has uploaded this change for review. ( https://gem5-review.googlesource.com/c/public/gem5/+/40536 ) Change subject: misc: Revert version info for develop branch .. misc: Revert version info for develop branch Change-Id: Ie01f41cb40b025ef31028bff4d59023e380fcf07 --- M src/Doxyfile M src/base/version.cc 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Doxyfile b/src/Doxyfile index ddc3933..d453314 100644 --- a/src/Doxyfile +++ b/src/Doxyfile @@ -31,7 +31,7 @@ # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = v20.1.0.3 +PROJECT_NUMBER = DEVELOP-FOR-V20.2 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # base path where the generated documentation will be put. diff --git a/src/base/version.cc b/src/base/version.cc index d30ddd1..cfa98f9 100644 --- a/src/base/version.cc +++ b/src/base/version.cc @@ -29,4 +29,4 @@ /** * @ingroup api_base_utils */ -const char *gem5Version = "20.1.0.3"; +const char *gem5Version = "[DEVELOP-FOR-V20.2]"; -- To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/40536 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: Ie01f41cb40b025ef31028bff4d59023e380fcf07 Gerrit-Change-Number: 40536 Gerrit-PatchSet: 1 Gerrit-Owner: Bobby R. Bruce Gerrit-MessageType: newchange ___ 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
[gem5-dev] Change in gem5/gem5[develop]: scons,python: Fix `--without-python` flag
://gem5-review.googlesource.com/c/public/gem5/+/39715 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: I2242f2971a49ef28cff229ad0337bce0a998413d Gerrit-Change-Number: 39715 Gerrit-PatchSet: 4 Gerrit-Owner: Bobby R. Bruce Gerrit-Reviewer: Andreas Sandberg Gerrit-Reviewer: Bobby R. Bruce Gerrit-Reviewer: Gabe Black Gerrit-Reviewer: Gabe Black Gerrit-Reviewer: Jason Lowe-Power Gerrit-Reviewer: Lukas Steiner Gerrit-Reviewer: kokoro 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
[gem5-dev] Change in gem5/gem5[hotfix-feat-vhe-fix]: misc: Updated the RELEASE-NOTES and version number
Bobby R. Bruce has submitted this change. ( https://gem5-review.googlesource.com/c/public/gem5/+/40435 ) Change subject: misc: Updated the RELEASE-NOTES and version number .. misc: Updated the RELEASE-NOTES and version number Updated the RELEASE-NOTES.md and version number for the v20.1.0.3 hotfix release. Change-Id: I95ab84ea259f5e0529ebaa32be65d9a14370f219 Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/40435 Reviewed-by: Bobby R. Bruce Reviewed-by: Jason Lowe-Power Maintainer: Bobby R. Bruce Tested-by: kokoro --- M RELEASE-NOTES.md M src/Doxyfile M src/base/version.cc 3 files changed, 7 insertions(+), 2 deletions(-) Approvals: Jason Lowe-Power: Looks good to me, approved Bobby R. Bruce: Looks good to me, approved; Looks good to me, approved kokoro: Regressions pass diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md index 71934a7..c84d9b4 100644 --- a/RELEASE-NOTES.md +++ b/RELEASE-NOTES.md @@ -1,3 +1,8 @@ +# Version 20.1.0.3 + +**[HOTFIX]** A patch was apply to fix an [error where booting Linux stalled when using the ARM ISA](https://gem5.atlassian.net/browse/GEM5-901). +This fix adds the parameter `have_vhe` to enable FEAT_VHE on demand, and is disabled by default to resolve this issue. + # Version 20.1.0.2 **[HOTFIX]** This hotfix release fixes known two bugs: diff --git a/src/Doxyfile b/src/Doxyfile index b934639..ddc3933 100644 --- a/src/Doxyfile +++ b/src/Doxyfile @@ -31,7 +31,7 @@ # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = v20.1.0.2 +PROJECT_NUMBER = v20.1.0.3 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # base path where the generated documentation will be put. diff --git a/src/base/version.cc b/src/base/version.cc index 304ccc1..d30ddd1 100644 --- a/src/base/version.cc +++ b/src/base/version.cc @@ -29,4 +29,4 @@ /** * @ingroup api_base_utils */ -const char *gem5Version = "20.1.0.2"; +const char *gem5Version = "20.1.0.3"; -- To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/40435 To unsubscribe, or for help writing mail filters, visit https://gem5-review.googlesource.com/settings Gerrit-Project: public/gem5 Gerrit-Branch: hotfix-feat-vhe-fix Gerrit-Change-Id: I95ab84ea259f5e0529ebaa32be65d9a14370f219 Gerrit-Change-Number: 40435 Gerrit-PatchSet: 2 Gerrit-Owner: Bobby R. Bruce Gerrit-Reviewer: Bobby R. Bruce Gerrit-Reviewer: Jason Lowe-Power Gerrit-Reviewer: Jason Lowe-Power Gerrit-Reviewer: kokoro 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
[gem5-dev] Change in gem5/gem5[develop]: gpu-compute,misc: Fix Clang missing override errors
Bobby R. Bruce has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/40396 )
Change subject: gpu-compute,misc: Fix Clang missing override errors
..
gpu-compute,misc: Fix Clang missing override errors
Clang fails to compile GCN3 due to missing overrides in
`src/gpu-compute/gpu_command_processor.hh`. This commit fixes this
errror.
Change-Id: I6da9fce7c3eb86a5418a931ee4f225cceda488a5
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/40396
Reviewed-by: Jason Lowe-Power
Reviewed-by: Matt Sinclair
Maintainer: Jason Lowe-Power
Maintainer: Matt Sinclair
Tested-by: kokoro
---
M src/gpu-compute/gpu_command_processor.hh
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Jason Lowe-Power: Looks good to me, approved; Looks good to me, approved
Matt Sinclair: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/gpu-compute/gpu_command_processor.hh
b/src/gpu-compute/gpu_command_processor.hh
index 8f6bfe2..ebdf9ae 100644
--- a/src/gpu-compute/gpu_command_processor.hh
+++ b/src/gpu-compute/gpu_command_processor.hh
@@ -87,7 +87,7 @@
void updateHsaSignal(Addr signal_handle, uint64_t signal_value)
override;
-uint64_t functionalReadHsaSignal(Addr signal_handle);
+uint64_t functionalReadHsaSignal(Addr signal_handle) override;
Addr getHsaSignalValueAddr(Addr signal_handle)
{
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/40396
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: I6da9fce7c3eb86a5418a931ee4f225cceda488a5
Gerrit-Change-Number: 40396
Gerrit-PatchSet: 2
Gerrit-Owner: Bobby R. Bruce
Gerrit-Reviewer: Alexandru Duțu
Gerrit-Reviewer: Bobby R. Bruce
Gerrit-Reviewer: Jason Lowe-Power
Gerrit-Reviewer: Jason Lowe-Power
Gerrit-Reviewer: Matt Sinclair
Gerrit-Reviewer: Matthew Poremba
Gerrit-Reviewer: kokoro
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
[gem5-dev] Change in gem5/gem5[develop]: arch-riscv,misc: Fix clang missing override errors
Bobby R. Bruce has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/40395 )
Change subject: arch-riscv,misc: Fix clang missing override errors
..
arch-riscv,misc: Fix clang missing override errors
Clang 9 failed to compile RISC-V due to missing overrides in
`src/arch/riscv/remote_gdb.hh`. This commit adds these missing
overrides.
Change-Id: Id0bfc371ca3e3e1b91e9112a837e1862072bf9d2
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/40395
Reviewed-by: Jason Lowe-Power
Maintainer: Jason Lowe-Power
Tested-by: kokoro
---
M src/arch/riscv/remote_gdb.hh
1 file changed, 3 insertions(+), 2 deletions(-)
Approvals:
Jason Lowe-Power: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/arch/riscv/remote_gdb.hh b/src/arch/riscv/remote_gdb.hh
index 545a43c..d66c30d 100644
--- a/src/arch/riscv/remote_gdb.hh
+++ b/src/arch/riscv/remote_gdb.hh
@@ -147,14 +147,15 @@
* GDB then queries for xml blobs using qXfer:features:read:xxx.xml
*/
std::vector
-availableFeatures() const
+availableFeatures() const override
{
return {"qXfer:features:read+"};
};
/**
* Reply to qXfer:features:read:xxx.xml qeuries
*/
-bool getXferFeaturesRead(const std::string , std::string
);
+bool getXferFeaturesRead(const std::string ,
+ std::string ) override;
};
} // namespace RiscvISA
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/40395
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: Id0bfc371ca3e3e1b91e9112a837e1862072bf9d2
Gerrit-Change-Number: 40395
Gerrit-PatchSet: 2
Gerrit-Owner: Bobby R. Bruce
Gerrit-Reviewer: Bobby R. Bruce
Gerrit-Reviewer: Jason Lowe-Power
Gerrit-Reviewer: Jason Lowe-Power
Gerrit-Reviewer: kokoro
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
[gem5-dev] Change in gem5/gem5[develop]: gpu-compute,misc: Remove unused private variable
Bobby R. Bruce has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/40397 )
Change subject: gpu-compute,misc: Remove unused private variable
..
gpu-compute,misc: Remove unused private variable
Clang 9 fails to compile GCN3 due to the unused private variable,
`_nxtFreeIdx`, in `src/gpu-compute/dyn_pool_manager.hh`. This variable
has therefore been removed.
Change-Id: I33f2e9634bbf8d5cea7a42ae2ac9f3ea8298d406
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/40397
Reviewed-by: Matt Sinclair
Maintainer: Matt Sinclair
Tested-by: kokoro
---
M src/gpu-compute/dyn_pool_manager.hh
1 file changed, 1 insertion(+), 3 deletions(-)
Approvals:
Matt Sinclair: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/gpu-compute/dyn_pool_manager.hh
b/src/gpu-compute/dyn_pool_manager.hh
index dc8ffec..151a33f 100644
--- a/src/gpu-compute/dyn_pool_manager.hh
+++ b/src/gpu-compute/dyn_pool_manager.hh
@@ -46,7 +46,7 @@
{
public:
DynPoolManager(const PoolManagerParams )
-: PoolManager(p), _regionSize(0), _nxtFreeIdx(0)
+: PoolManager(p), _regionSize(0)
{
_totRegSpaceAvailable = p.pool_size;
}
@@ -63,8 +63,6 @@
// actual size of a region (normalized to the minimum size that can
// be reserved)
uint32_t _regionSize;
-// next index to allocate a region
-int _nxtFreeIdx;
// total registers available - across chunks
uint32_t _totRegSpaceAvailable;
// regIndex and freeSpace record
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/40397
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: I33f2e9634bbf8d5cea7a42ae2ac9f3ea8298d406
Gerrit-Change-Number: 40397
Gerrit-PatchSet: 2
Gerrit-Owner: Bobby R. Bruce
Gerrit-Reviewer: Bobby R. Bruce
Gerrit-Reviewer: Jason Lowe-Power
Gerrit-Reviewer: Matt Sinclair
Gerrit-Reviewer: Matthew Poremba
Gerrit-Reviewer: kokoro
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
[gem5-dev] Change in gem5/gem5[develop]: tests: Increase presubmit (Kokoro) timeout to 6 hours
Bobby R. Bruce has submitted this change. ( https://gem5-review.googlesource.com/c/public/gem5/+/40455 ) Change subject: tests: Increase presubmit (Kokoro) timeout to 6 hours .. tests: Increase presubmit (Kokoro) timeout to 6 hours Kokoro is now frequnetly timing out. This will increase the timeout from 5 hours to 6 hours. Change-Id: I2124567142358ab183d962fcbd73ee9ea4e809a3 Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/40455 Reviewed-by: Jason Lowe-Power Reviewed-by: Gabe Black Maintainer: Jason Lowe-Power Tested-by: kokoro --- M tests/jenkins/presubmit.cfg 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jason Lowe-Power: Looks good to me, but someone else must approve; Looks good to me, approved Gabe Black: Looks good to me, approved kokoro: Regressions pass diff --git a/tests/jenkins/presubmit.cfg b/tests/jenkins/presubmit.cfg index 76bdb04..a356c76 100644 --- a/tests/jenkins/presubmit.cfg +++ b/tests/jenkins/presubmit.cfg @@ -3,4 +3,4 @@ # Location of the continuous batch script in repository. build_file: "jenkins-gem5-prod/tests/jenkins/presubmit.sh" -timeout_mins: 300 # 5 hours +timeout_mins: 360 # 6 hours -- To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/40455 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: I2124567142358ab183d962fcbd73ee9ea4e809a3 Gerrit-Change-Number: 40455 Gerrit-PatchSet: 2 Gerrit-Owner: Bobby R. Bruce Gerrit-Reviewer: Andreas Sandberg Gerrit-Reviewer: Bobby R. Bruce Gerrit-Reviewer: Gabe Black Gerrit-Reviewer: Giacomo Travaglini Gerrit-Reviewer: Jason Lowe-Power Gerrit-Reviewer: Jason Lowe-Power Gerrit-Reviewer: kokoro Gerrit-CC: Matt Sinclair 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
[gem5-dev] Change in gem5/gem5[develop]: tests: Increase presubmit (Kokoro) timeout to 6 hours
Bobby R. Bruce has uploaded this change for review. ( https://gem5-review.googlesource.com/c/public/gem5/+/40455 ) Change subject: tests: Increase presubmit (Kokoro) timeout to 6 hours .. tests: Increase presubmit (Kokoro) timeout to 6 hours Kokoro is now frequnetly timing out. This will increase the timeout from 5 hours to 6 hours. Change-Id: I2124567142358ab183d962fcbd73ee9ea4e809a3 --- M tests/jenkins/presubmit.cfg 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/jenkins/presubmit.cfg b/tests/jenkins/presubmit.cfg index 76bdb04..a356c76 100644 --- a/tests/jenkins/presubmit.cfg +++ b/tests/jenkins/presubmit.cfg @@ -3,4 +3,4 @@ # Location of the continuous batch script in repository. build_file: "jenkins-gem5-prod/tests/jenkins/presubmit.sh" -timeout_mins: 300 # 5 hours +timeout_mins: 360 # 6 hours -- To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/40455 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: I2124567142358ab183d962fcbd73ee9ea4e809a3 Gerrit-Change-Number: 40455 Gerrit-PatchSet: 1 Gerrit-Owner: Bobby R. Bruce Gerrit-MessageType: newchange ___ 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
[gem5-dev] Change in gem5/gem5[develop]: util,python: Fix Pre-commit hooks to ignore non-source files
Bobby R. Bruce has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/39795 )
Change subject: util,python: Fix Pre-commit hooks to ignore non-source files
..
util,python: Fix Pre-commit hooks to ignore non-source files
Previously if binary blobs were modified the pre-commit hook attempted
to run style-checks on the binary, causing an error when attempting to
decode to utf-8. This commit runs a check on each file to ensure it has
a valid source-code extension prior to running style checks. If a file
does not have a valid extension style checks are not run.
Change-Id: Id1263cac0d6c190ad1a3d67720b3f373e0e42234
Issue-on: https://gem5.atlassian.net/browse/GEM5-903
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/39795
Reviewed-by: Jason Lowe-Power
Maintainer: Jason Lowe-Power
Tested-by: kokoro
---
M util/style/style.py
1 file changed, 13 insertions(+), 5 deletions(-)
Approvals:
Jason Lowe-Power: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/util/style/style.py b/util/style/style.py
index e765a92..1a5e94b 100644
--- a/util/style/style.py
+++ b/util/style/style.py
@@ -86,6 +86,15 @@
return rex.match(fname)
return match_re
+def _re_only(expr):
+"""Helper function to create regular expressions to only keep
+matcher functions"""
+
+rex = re.compile(expr)
+def match_re(fname):
+return not rex.match(fname)
+return match_re
+
# This list contains a list of functions that are called to determine
# if a file should be excluded from the style matching rules or
# not. The functions are called with the file name relative to the
@@ -97,11 +106,10 @@
_re_ignore("^ext/"),
# Ignore test data, as they are not code
_re_ignore("^tests/(?:quick|long)/"),
-# Ignore RISC-V assembly tests as they are maintained in an external
-# project that does not follow the gem5 coding convention
-_re_ignore("tests/test-progs/asmtest/src/riscv/"),
-# Ignore RISC-V assembly dump files
-_re_ignore("tests/test-progs/asmtest/dump/riscv/")
+# Only include Scons files and those with extensions that suggest
source
+# code
+_re_only("^((.*\/)?(SConscript|SConstruct)|"
+ ".*\.(c|h|cc|hh|cpp|hpp|py|isa|proto))$")
]
def check_ignores(fname):
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/39795
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: Id1263cac0d6c190ad1a3d67720b3f373e0e42234
Gerrit-Change-Number: 39795
Gerrit-PatchSet: 4
Gerrit-Owner: Bobby R. Bruce
Gerrit-Reviewer: Andreas Sandberg
Gerrit-Reviewer: Bobby R. Bruce
Gerrit-Reviewer: Boris Shingarov
Gerrit-Reviewer: Gabe Black
Gerrit-Reviewer: Jason Lowe-Power
Gerrit-Reviewer: Jason Lowe-Power
Gerrit-Reviewer: kokoro
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
[gem5-dev] Change in gem5/gem5[develop]: util,python: Add check to ensure files are utf-8 in pre-commit
Bobby R. Bruce has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/40015 )
Change subject: util,python: Add check to ensure files are utf-8 in
pre-commit
..
util,python: Add check to ensure files are utf-8 in pre-commit
The `file_from_index` function throws a UnicodeDecodeError if a modified
file targetted for style-checking (i.e. source-code) cannot be decoded
using `.decode("utf-8")`.
This check throws an error informing the user a submitted file must be
utf-8 encoded if this case arises.
Change-Id: I2361017f2e7413ed60f897d2301f2e4c7995dd76
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/40015
Reviewed-by: Jason Lowe-Power
Maintainer: Jason Lowe-Power
Tested-by: kokoro
---
M util/git-pre-commit.py
1 file changed, 10 insertions(+), 2 deletions(-)
Approvals:
Jason Lowe-Power: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/util/git-pre-commit.py b/util/git-pre-commit.py
index bf13f3b..82fcf39 100755
--- a/util/git-pre-commit.py
+++ b/util/git-pre-commit.py
@@ -76,8 +76,16 @@
else:
regions = all_regions
-# Show they appropriate object and dump it to a file
-status = git.file_from_index(fname)
+# Show the appropriate object and dump it to a file
+try:
+status = git.file_from_index(fname)
+except UnicodeDecodeError:
+print("Decoding '" + fname
++ "' throws a UnicodeDecodeError.", file=sys.stderr)
+print("Please check '" + fname
++ "' exclusively uses utf-8 character encoding.",
file=sys.stderr)
+sys.exit(1)
+
f = TemporaryFile()
f.write(status.encode('utf-8'))
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/40015
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: I2361017f2e7413ed60f897d2301f2e4c7995dd76
Gerrit-Change-Number: 40015
Gerrit-PatchSet: 3
Gerrit-Owner: Bobby R. Bruce
Gerrit-Reviewer: Andreas Sandberg
Gerrit-Reviewer: Bobby R. Bruce
Gerrit-Reviewer: Gabe Black
Gerrit-Reviewer: Jason Lowe-Power
Gerrit-Reviewer: Jason Lowe-Power
Gerrit-Reviewer: kokoro
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
[gem5-dev] Change in gem5/gem5[hotfix-feat-vhe-fix]: misc: Updated the RELEASE-NOTES and version number
Bobby R. Bruce has uploaded this change for review. ( https://gem5-review.googlesource.com/c/public/gem5/+/40435 ) Change subject: misc: Updated the RELEASE-NOTES and version number .. misc: Updated the RELEASE-NOTES and version number Updated the RELEASE-NOTES.md and version number for the v20.1.0.3 hotfix release. Change-Id: I95ab84ea259f5e0529ebaa32be65d9a14370f219 --- M RELEASE-NOTES.md M src/Doxyfile M src/base/version.cc 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md index 71934a7..c84d9b4 100644 --- a/RELEASE-NOTES.md +++ b/RELEASE-NOTES.md @@ -1,3 +1,8 @@ +# Version 20.1.0.3 + +**[HOTFIX]** A patch was apply to fix an [error where booting Linux stalled when using the ARM ISA](https://gem5.atlassian.net/browse/GEM5-901). +This fix adds the parameter `have_vhe` to enable FEAT_VHE on demand, and is disabled by default to resolve this issue. + # Version 20.1.0.2 **[HOTFIX]** This hotfix release fixes known two bugs: diff --git a/src/Doxyfile b/src/Doxyfile index b934639..ddc3933 100644 --- a/src/Doxyfile +++ b/src/Doxyfile @@ -31,7 +31,7 @@ # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = v20.1.0.2 +PROJECT_NUMBER = v20.1.0.3 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # base path where the generated documentation will be put. diff --git a/src/base/version.cc b/src/base/version.cc index 304ccc1..d30ddd1 100644 --- a/src/base/version.cc +++ b/src/base/version.cc @@ -29,4 +29,4 @@ /** * @ingroup api_base_utils */ -const char *gem5Version = "20.1.0.2"; +const char *gem5Version = "20.1.0.3"; -- To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/40435 To unsubscribe, or for help writing mail filters, visit https://gem5-review.googlesource.com/settings Gerrit-Project: public/gem5 Gerrit-Branch: hotfix-feat-vhe-fix Gerrit-Change-Id: I95ab84ea259f5e0529ebaa32be65d9a14370f219 Gerrit-Change-Number: 40435 Gerrit-PatchSet: 1 Gerrit-Owner: Bobby R. Bruce Gerrit-MessageType: newchange ___ 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
[gem5-dev] Change in gem5/gem5[develop]: tests: Changed 'long' boot tests to X86 from GCN3_X86
Bobby R. Bruce has uploaded this change for review. ( https://gem5-review.googlesource.com/c/public/gem5/+/40415 ) Change subject: tests: Changed 'long' boot tests to X86 from GCN3_X86 .. tests: Changed 'long' boot tests to X86 from GCN3_X86 We compile GCN3_X86 for the 'quick' tests, as a substitute for X86. We compile X86 as part of our nightly tests, along with the running of the 'long' tests. This leads to a needless duplicate compilation of the X86 isa during our nightly tests. Therefore, this commit removes GCN3_X86 for the 'long' tests (only the x86 boot tests are affected). Change-Id: Ifd8aaf0e7b8178c588ace33b27671d4ba9b353ed --- M tests/gem5/x86-boot-tests/test_linux_boot.py 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/gem5/x86-boot-tests/test_linux_boot.py b/tests/gem5/x86-boot-tests/test_linux_boot.py index 62f82f9..5422425 100644 --- a/tests/gem5/x86-boot-tests/test_linux_boot.py +++ b/tests/gem5/x86-boot-tests/test_linux_boot.py @@ -60,7 +60,7 @@ '--num-cpus', num_cpus, '--boot-type', boot_type, ], -valid_isas = (constants.gcn3_x86_tag,), +valid_isas = (constants.x86_tag,), valid_hosts = host, length = constants.long_tag, ) -- To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/40415 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: Ifd8aaf0e7b8178c588ace33b27671d4ba9b353ed Gerrit-Change-Number: 40415 Gerrit-PatchSet: 1 Gerrit-Owner: Bobby R. Bruce Gerrit-MessageType: newchange ___ 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
[gem5-dev] Change in gem5/gem5[develop]: gpu-compute,misc: Remove unused private variable
Bobby R. Bruce has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/40397 )
Change subject: gpu-compute,misc: Remove unused private variable
..
gpu-compute,misc: Remove unused private variable
Clang 9 fails to compile GCN3 due to the unused private variable,
`_nxtFreeIdx`, in `src/gpu-compute/dyn_pool_manager.hh`. This variable
has therefore been removed.
Change-Id: I33f2e9634bbf8d5cea7a42ae2ac9f3ea8298d406
---
M src/gpu-compute/dyn_pool_manager.hh
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/src/gpu-compute/dyn_pool_manager.hh
b/src/gpu-compute/dyn_pool_manager.hh
index dc8ffec..151a33f 100644
--- a/src/gpu-compute/dyn_pool_manager.hh
+++ b/src/gpu-compute/dyn_pool_manager.hh
@@ -46,7 +46,7 @@
{
public:
DynPoolManager(const PoolManagerParams )
-: PoolManager(p), _regionSize(0), _nxtFreeIdx(0)
+: PoolManager(p), _regionSize(0)
{
_totRegSpaceAvailable = p.pool_size;
}
@@ -63,8 +63,6 @@
// actual size of a region (normalized to the minimum size that can
// be reserved)
uint32_t _regionSize;
-// next index to allocate a region
-int _nxtFreeIdx;
// total registers available - across chunks
uint32_t _totRegSpaceAvailable;
// regIndex and freeSpace record
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/40397
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: I33f2e9634bbf8d5cea7a42ae2ac9f3ea8298d406
Gerrit-Change-Number: 40397
Gerrit-PatchSet: 1
Gerrit-Owner: Bobby R. Bruce
Gerrit-MessageType: newchange
___
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
[gem5-dev] Change in gem5/gem5[develop]: gpu-compute,misc: Fix Clang missing override errors
Bobby R. Bruce has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/40396 )
Change subject: gpu-compute,misc: Fix Clang missing override errors
..
gpu-compute,misc: Fix Clang missing override errors
Clang fails to compile GCN3 due to missing overrides in
`src/gpu-compute/gpu_command_processor.hh`. This commit fixes this
errror.
Change-Id: I6da9fce7c3eb86a5418a931ee4f225cceda488a5
---
M src/gpu-compute/gpu_command_processor.hh
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/gpu-compute/gpu_command_processor.hh
b/src/gpu-compute/gpu_command_processor.hh
index f067999..559f6ab 100644
--- a/src/gpu-compute/gpu_command_processor.hh
+++ b/src/gpu-compute/gpu_command_processor.hh
@@ -89,7 +89,7 @@
void updateHsaSignal(Addr signal_handle, uint64_t signal_value)
override;
-uint64_t functionalReadHsaSignal(Addr signal_handle);
+uint64_t functionalReadHsaSignal(Addr signal_handle) override;
Addr getHsaSignalValueAddr(Addr signal_handle)
{
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/40396
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: I6da9fce7c3eb86a5418a931ee4f225cceda488a5
Gerrit-Change-Number: 40396
Gerrit-PatchSet: 1
Gerrit-Owner: Bobby R. Bruce
Gerrit-MessageType: newchange
___
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
[gem5-dev] Change in gem5/gem5[develop]: arch-riscv,misc: Fix clang missing override errors
Bobby R. Bruce has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/40395 )
Change subject: arch-riscv,misc: Fix clang missing override errors
..
arch-riscv,misc: Fix clang missing override errors
Clang 9 failed to compile RISC-V due to missing overrides in
`src/arch/riscv/remote_gdb.hh`. This commit adds these missing
overrides.
Change-Id: Id0bfc371ca3e3e1b91e9112a837e1862072bf9d2
---
M src/arch/riscv/remote_gdb.hh
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/arch/riscv/remote_gdb.hh b/src/arch/riscv/remote_gdb.hh
index 545a43c..d66c30d 100644
--- a/src/arch/riscv/remote_gdb.hh
+++ b/src/arch/riscv/remote_gdb.hh
@@ -147,14 +147,15 @@
* GDB then queries for xml blobs using qXfer:features:read:xxx.xml
*/
std::vector
-availableFeatures() const
+availableFeatures() const override
{
return {"qXfer:features:read+"};
};
/**
* Reply to qXfer:features:read:xxx.xml qeuries
*/
-bool getXferFeaturesRead(const std::string , std::string
);
+bool getXferFeaturesRead(const std::string ,
+ std::string ) override;
};
} // namespace RiscvISA
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/40395
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: Id0bfc371ca3e3e1b91e9112a837e1862072bf9d2
Gerrit-Change-Number: 40395
Gerrit-PatchSet: 1
Gerrit-Owner: Bobby R. Bruce
Gerrit-MessageType: newchange
___
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
[gem5-dev] Change in gem5/gem5[develop]: ext: Fix Queue import in handlers.py
Bobby R. Bruce has uploaded this change for review. ( https://gem5-review.googlesource.com/c/public/gem5/+/40155 ) Change subject: ext: Fix Queue import in handlers.py .. ext: Fix Queue import in handlers.py Previously this caused the following error when trying to run tests: ``` Traceback (most recent call last): File "/fasthome/bbruce/gem5/tests/../ext/testlib/handlers.py", line 392, in _drain item = self.queue.get(block=False) File "/usr/lib/python3.6/multiprocessing/queues.py", line 107, in get raise Empty queue.Empty ``` This was due to a change in the importing of the queue package in https://gem5-review.googlesource.com/c/public/gem5/+/39759 Change-Id: I17dacba0948b48cba91cca472f028bf10b277ea2 --- M ext/testlib/handlers.py 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/testlib/handlers.py b/ext/testlib/handlers.py index b62322f..c96cc8b 100644 --- a/ext/testlib/handlers.py +++ b/ext/testlib/handlers.py @@ -44,7 +44,7 @@ import testlib.state as state import testlib.terminal as terminal -from queue import Queue +import queue as Queue from testlib.configuration import constants -- To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/40155 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: I17dacba0948b48cba91cca472f028bf10b277ea2 Gerrit-Change-Number: 40155 Gerrit-PatchSet: 1 Gerrit-Owner: Bobby R. Bruce Gerrit-MessageType: newchange ___ 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
[gem5-dev] Change in gem5/gem5[develop]: util,python: Add check to ensure files are utf-8 in pre-commit
Bobby R. Bruce has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/40015 )
Change subject: util,python: Add check to ensure files are utf-8 in
pre-commit
..
util,python: Add check to ensure files are utf-8 in pre-commit
The `file_from_index` function throws a UnicodeDecodeError if a modified
file targetted for style-checking (i.e. source-code) cannot be decoded
using `.decode("utf-8")`.
This check throws an error informing the user a submitted file must be
utf-8 encoded if this case arises.
Change-Id: I2361017f2e7413ed60f897d2301f2e4c7995dd76
---
M util/git-pre-commit.py
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/util/git-pre-commit.py b/util/git-pre-commit.py
index bf13f3b..50d93b5 100755
--- a/util/git-pre-commit.py
+++ b/util/git-pre-commit.py
@@ -76,8 +76,16 @@
else:
regions = all_regions
-# Show they appropriate object and dump it to a file
-status = git.file_from_index(fname)
+# Show the appropriate object and dump it to a file
+try:
+status = git.file_from_index(fname)
+except UnicodeDecodeError:
+print("Decoding '" + fname
++ "' throws a UnicodeDecodeError.", file=sys.stderr)
+print("Please check '" + fname
++ "' exclusively uses utf-8 character encoding.")
+sys.exit(1)
+
f = TemporaryFile()
f.write(status.encode('utf-8'))
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/40015
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: I2361017f2e7413ed60f897d2301f2e4c7995dd76
Gerrit-Change-Number: 40015
Gerrit-PatchSet: 1
Gerrit-Owner: Bobby R. Bruce
Gerrit-MessageType: newchange
___
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
[gem5-dev] Change in gem5/gem5[develop]: misc,python: Fix Pre-commit hooks to ignore non-utf-8 files
Bobby R. Bruce has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/39795 )
Change subject: misc,python: Fix Pre-commit hooks to ignore non-utf-8 files
..
misc,python: Fix Pre-commit hooks to ignore non-utf-8 files
Previously if binary blobs were modified the pre-commit hook attempted
to run style-checks on the binary, causing an error when attempting to
decode to utf-8. This commit runs a check on each file to ensure it's
utf-8 encoded before running pre-commit procedures. If not utf-8, the
pre-commit checks are not performed on that file.
Change-Id: Id1263cac0d6c190ad1a3d67720b3f373e0e42234
Issue-on: https://gem5.atlassian.net/browse/GEM5-903
---
M util/style/style.py
1 file changed, 27 insertions(+), 1 deletion(-)
diff --git a/util/style/style.py b/util/style/style.py
index e765a92..2fb3def 100644
--- a/util/style/style.py
+++ b/util/style/style.py
@@ -40,6 +40,7 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
from abc import ABCMeta, abstractmethod
+import codecs
import difflib
import re
import sys
@@ -86,6 +87,29 @@
return rex.match(fname)
return match_re
+def _not_utf8(fname: str) -> bool:
+"""Returns True if a file is not utf-8.
+
+Parameters
+--
+fname: str
+The file to check
+
+Returns
+---
+bool
+False if the file is utf-8 formatted, otherwise True.
+"""
+
+try:
+f = codecs.open(fname, encoding='utf-8', errors='strict')
+for line in f:
+pass
+except UnicodeDecodeError:
+return True
+
+return False
+
# This list contains a list of functions that are called to determine
# if a file should be excluded from the style matching rules or
# not. The functions are called with the file name relative to the
@@ -101,7 +125,9 @@
# project that does not follow the gem5 coding convention
_re_ignore("tests/test-progs/asmtest/src/riscv/"),
# Ignore RISC-V assembly dump files
-_re_ignore("tests/test-progs/asmtest/dump/riscv/")
+_re_ignore("tests/test-progs/asmtest/dump/riscv/"),
+# Ignore files that are not utf-8 formatted.
+_not_utf8
]
def check_ignores(fname):
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/39795
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: Id1263cac0d6c190ad1a3d67720b3f373e0e42234
Gerrit-Change-Number: 39795
Gerrit-PatchSet: 1
Gerrit-Owner: Bobby R. Bruce
Gerrit-MessageType: newchange
___
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
[gem5-dev] Change in gem5/gem5[develop]: scons,python: Fix `--without-python` flag
Bobby R. Bruce has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/39715 )
Change subject: scons,python: Fix `--without-python` flag
..
scons,python: Fix `--without-python` flag
Even with the `--without-python` flag, checks were still done to ensure
the correct version of Python was being used. This commit fixes this so
these checks are not performed when `--without-python` is enabled.
Change-Id: I2242f2971a49ef28cff229ad0337bce0a998413d
Issue-on: https://gem5.atlassian.net/browse/GEM5-880
---
M SConstruct
1 file changed, 11 insertions(+), 10 deletions(-)
diff --git a/SConstruct b/SConstruct
index 4cf2f10..752f877 100755
--- a/SConstruct
+++ b/SConstruct
@@ -714,17 +714,18 @@
marshal_env = main.Clone()
marshal_env.Append(CCFLAGS='$MARSHAL_CCFLAGS_EXTRA')
marshal_env.Append(LINKFLAGS='$MARSHAL_LDFLAGS_EXTRA')
-py_version = conf.CheckPythonLib()
-if not py_version:
-error("Can't find a working Python installation")
+if main['USE_PYTHON']:
+py_version = conf.CheckPythonLib()
+if not py_version:
+error("Can't find a working Python installation")
-# Found a working Python installation. Check if it meets minimum
-# requirements.
-if py_version[0] < 3 or \
- (py_version[0] == 3 and py_version[1] < 6):
-error('Python version too old. Version 3.6 or newer is required.')
-elif py_version[0] > 3:
-warning('Python version too new. Python 3 expected.')
+# Found a working Python installation. Check if it meets minimum
+# requirements.
+if py_version[0] < 3 or \
+(py_version[0] == 3 and py_version[1] < 6):
+error('Python version too old. Version 3.6 or newer is required.')
+elif py_version[0] > 3:
+warning('Python version too new. Python 3 expected.')
# On Solaris you need to use libsocket for socket ops
if not
conf.CheckLibWithHeader(None, 'sys/socket.h', 'C++', 'accept(0,0,0);'):
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/39715
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: I2242f2971a49ef28cff229ad0337bce0a998413d
Gerrit-Change-Number: 39715
Gerrit-PatchSet: 1
Gerrit-Owner: Bobby R. Bruce
Gerrit-MessageType: newchange
___
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
[gem5-dev] Change in gem5/gem5[develop]: util,python: Updated git-pre-commit.py to use Python3
Bobby R. Bruce has submitted this change. ( https://gem5-review.googlesource.com/c/public/gem5/+/38475 ) Change subject: util,python: Updated git-pre-commit.py to use Python3 .. util,python: Updated git-pre-commit.py to use Python3 Change-Id: I3897a57237637a55e75b3c9c4cb43918b39cf7d0 Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/38475 Reviewed-by: Jason Lowe-Power Reviewed-by: Matt Sinclair Reviewed-by: Andreas Sandberg Maintainer: Jason Lowe-Power Maintainer: Gabe Black Tested-by: kokoro --- M util/git-pre-commit.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jason Lowe-Power: Looks good to me, approved; Looks good to me, approved Andreas Sandberg: Looks good to me, approved Matt Sinclair: Looks good to me, approved Gabe Black: Looks good to me, approved kokoro: Regressions pass diff --git a/util/git-pre-commit.py b/util/git-pre-commit.py index 4e443ec..bf13f3b 100755 --- a/util/git-pre-commit.py +++ b/util/git-pre-commit.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # # Copyright (c) 2016 ARM Limited # All rights reserved -- To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/38475 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: I3897a57237637a55e75b3c9c4cb43918b39cf7d0 Gerrit-Change-Number: 38475 Gerrit-PatchSet: 2 Gerrit-Owner: Bobby R. Bruce Gerrit-Reviewer: Andreas Sandberg Gerrit-Reviewer: Bobby R. Bruce Gerrit-Reviewer: Gabe Black Gerrit-Reviewer: Jason Lowe-Power Gerrit-Reviewer: Jason Lowe-Power Gerrit-Reviewer: Matt Sinclair Gerrit-Reviewer: kokoro 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
[gem5-dev] Change in gem5/gem5[develop]: util,python: Updated maintainers.py to fix deprecation warning
Bobby R. Bruce has submitted this change. ( https://gem5-review.googlesource.com/c/public/gem5/+/38476 ) Change subject: util,python: Updated maintainers.py to fix deprecation warning .. util,python: Updated maintainers.py to fix deprecation warning The following warning was being thrown: ``` util/maint/lib/maintainers.py:120: YAMLLoadWarning: calling yaml.load() without Loader=... is deprecated, as the default Loader is unsafe. Please read https://msg.pyyaml.org/load for full details. ``` This is fixed by adding `Loader=yaml.SafeLoader` when calling `yaml.load()`. Change-Id: I3b79115379a45409967a8848175658ab3c13bfc7 Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/38476 Reviewed-by: Jason Lowe-Power Reviewed-by: Andreas Sandberg Maintainer: Jason Lowe-Power Tested-by: kokoro --- M util/maint/lib/maintainers.py 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Jason Lowe-Power: Looks good to me, approved; Looks good to me, approved Andreas Sandberg: Looks good to me, approved kokoro: Regressions pass diff --git a/util/maint/lib/maintainers.py b/util/maint/lib/maintainers.py index 0b29b67..6dd8d26 100644 --- a/util/maint/lib/maintainers.py +++ b/util/maint/lib/maintainers.py @@ -106,7 +106,7 @@ @classmethod def from_yaml(cls, yaml_str: str) -> "Maintainers": -return cls(yaml.load(yaml_str)) +return cls(yaml.load(yaml_str, Loader=yaml.SafeLoader)) @classmethod def _load_maintainers_file(cls, @@ -117,9 +117,9 @@ if isinstance(path_or_file, str): with open(path_or_file, 'r') as fin: -return yaml.load(fin) +return yaml.load(fin, Loader=yaml.SafeLoader) else: -return yaml.load(path_or_file) +return yaml.load(path_or_file, Loader=yaml.SafeLoader) @classmethod def _parse_subsystem(cls, tag: str, ydict: Mapping[str, Any]) -> Subsystem: -- To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/38476 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: I3b79115379a45409967a8848175658ab3c13bfc7 Gerrit-Change-Number: 38476 Gerrit-PatchSet: 3 Gerrit-Owner: Bobby R. Bruce Gerrit-Reviewer: Andreas Sandberg Gerrit-Reviewer: Bobby R. Bruce Gerrit-Reviewer: Gabe Black Gerrit-Reviewer: Hoa Nguyen Gerrit-Reviewer: Jason Lowe-Power Gerrit-Reviewer: Jason Lowe-Power Gerrit-Reviewer: kokoro 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
[gem5-dev] Change in gem5/gem5[develop]: util,python: Updated git-pre-commit.py to use Python3
Bobby R. Bruce has uploaded this change for review. ( https://gem5-review.googlesource.com/c/public/gem5/+/38475 ) Change subject: util,python: Updated git-pre-commit.py to use Python3 .. util,python: Updated git-pre-commit.py to use Python3 Change-Id: I3897a57237637a55e75b3c9c4cb43918b39cf7d0 --- M util/git-pre-commit.py 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util/git-pre-commit.py b/util/git-pre-commit.py index 4e443ec..bf13f3b 100755 --- a/util/git-pre-commit.py +++ b/util/git-pre-commit.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # # Copyright (c) 2016 ARM Limited # All rights reserved -- To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/38475 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: I3897a57237637a55e75b3c9c4cb43918b39cf7d0 Gerrit-Change-Number: 38475 Gerrit-PatchSet: 1 Gerrit-Owner: Bobby R. Bruce Gerrit-MessageType: newchange ___ 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
[gem5-dev] Change in gem5/gem5[develop]: util,python: Updated maintainers.py to fix deprecation warning
Bobby R. Bruce has uploaded this change for review. ( https://gem5-review.googlesource.com/c/public/gem5/+/38476 ) Change subject: util,python: Updated maintainers.py to fix deprecation warning .. util,python: Updated maintainers.py to fix deprecation warning The following warning was being thrown: ``` util/maint/lib/maintainers.py:120: YAMLLoadWarning: calling yaml.load() without Loader=... is deprecated, as the default Loader is unsafe. Please read https://msg.pyyaml.org/load for full details. ``` This is fixed by adding `Loader=yaml.FullLoader` when calling `yaml.load()`. Change-Id: I3b79115379a45409967a8848175658ab3c13bfc7 --- M util/maint/lib/maintainers.py 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/util/maint/lib/maintainers.py b/util/maint/lib/maintainers.py index 0b29b67..5d993f8 100644 --- a/util/maint/lib/maintainers.py +++ b/util/maint/lib/maintainers.py @@ -106,7 +106,7 @@ @classmethod def from_yaml(cls, yaml_str: str) -> "Maintainers": -return cls(yaml.load(yaml_str)) +return cls(yaml.load(yaml_str, Loader=yaml.FullLoader)) @classmethod def _load_maintainers_file(cls, @@ -117,9 +117,9 @@ if isinstance(path_or_file, str): with open(path_or_file, 'r') as fin: -return yaml.load(fin) +return yaml.load(fin, Loader=yaml.FullLoader) else: -return yaml.load(path_or_file) +return yaml.load(path_or_file, Loader=yaml.FullLoader) @classmethod def _parse_subsystem(cls, tag: str, ydict: Mapping[str, Any]) -> Subsystem: -- To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/38476 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: I3b79115379a45409967a8848175658ab3c13bfc7 Gerrit-Change-Number: 38476 Gerrit-PatchSet: 1 Gerrit-Owner: Bobby R. Bruce Gerrit-MessageType: newchange ___ 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
[gem5-dev] Change in gem5/gem5[develop]: tests: Standardized used of the ISA constants tags
SCV', 'ARM'),
+valid_isas=(constants.x86_tag, constants.riscv_tag, constants.arm_tag),
)
diff --git a/tests/gem5/learning_gem5/part2_test.py
b/tests/gem5/learning_gem5/part2_test.py
index 4209a9f..d487f80 100644
--- a/tests/gem5/learning_gem5/part2_test.py
+++ b/tests/gem5/learning_gem5/part2_test.py
@@ -35,7 +35,7 @@
verifiers = (get_verifier('simple'),),
config=joinpath(config_path, 'run_simple.py'),
config_args = [],
-valid_isas=("NULL",),
+valid_isas=(constants.null_tag,),
)
gem5_verify_config(
@@ -43,7 +43,7 @@
verifiers =(get_verifier('hello_goodbye'),),
config=joinpath(config_path, 'hello_goodbye.py'),
config_args = [],
-valid_isas=("NULL",),
+valid_isas=(constants.null_tag,),
)
gem5_verify_config(
@@ -51,7 +51,8 @@
verifiers =(verifier.MatchStdoutNoPerf(joinpath(ref_path, 'hello')),),
config=joinpath(config_path, 'simple_memobj.py'),
config_args = [],
-valid_isas=("X86",), # note: by default the above script uses x86
+# note: by default the above script uses x86
+valid_isas=(constants.x86_tag,),
)
gem5_verify_config(
@@ -59,7 +60,8 @@
verifiers =(verifier.MatchStdoutNoPerf(joinpath(ref_path, 'hello')),),
config=joinpath(config_path, 'simple_cache.py'),
config_args = [],
-valid_isas=("X86",), # note: by default the above script uses x86
+# note: by default the above script uses x86
+valid_isas=(constants.x86_tag,),
)
# Note: for simple memobj and simple cache I want to use the traffic
generator
diff --git a/tests/gem5/learning_gem5/part3_test.py
b/tests/gem5/learning_gem5/part3_test.py
index 9847ab7..e8ca351 100644
--- a/tests/gem5/learning_gem5/part3_test.py
+++ b/tests/gem5/learning_gem5/part3_test.py
@@ -39,8 +39,8 @@
config=joinpath(config_path, 'simple_ruby.py'),
config_args = [],
protocol = 'MSI',
-valid_isas=("X86",), # Currently only x86 has the threads test
-valid_hosts=constants.target_host["X86"], # dynamically linked
+valid_isas=(constants.x86_tag,), # Currently only x86 has the threads
test
+valid_hosts=constants.target_host[constants.x86_tag], # dynamically
linked
)
gem5_verify_config(
@@ -49,5 +49,5 @@
config=joinpath(config_path, 'ruby_test.py'),
config_args = [],
protocol = 'MSI',
-valid_isas=("X86",), # Currently only x86 has the threads test
+valid_isas=(constants.x86_tag,), # Currently only x86 has the threads
test
)
diff --git a/tests/gem5/m5_util/test_exit.py
b/tests/gem5/m5_util/test_exit.py
index 98c3fbd..ff900b8 100644
--- a/tests/gem5/m5_util/test_exit.py
+++ b/tests/gem5/m5_util/test_exit.py
@@ -59,5 +59,5 @@
fixtures=(test_program,),
config=os.path.join(config.base_dir, 'configs', 'example','se.py'),
config_args=['--cmd', joinpath(test_program.path, filename)],
-valid_isas=('X86',)
+valid_isas=(constants.x86_tag,)
)
diff --git a/tests/gem5/m5threads_test_atomic/test.py
b/tests/gem5/m5threads_test_atomic/test.py
index 6bb4eaf..9596d2f 100644
--- a/tests/gem5/m5threads_test_atomic/test.py
+++ b/tests/gem5/m5threads_test_atomic/test.py
@@ -57,7 +57,7 @@
config_args=['--cpu-type', cpu,
'--num-cores', '8',
'--cmd', joinpath(base_path, binary)],
-valid_isas=('SPARC',),
+valid_isas=(constants.sparc_tag,),
valid_hosts=constants.supported_hosts,
length = constants.long_tag,
)
diff --git a/tests/gem5/memory/test.py b/tests/gem5/memory/test.py
index beed084..7b839f2 100644
--- a/tests/gem5/memory/test.py
+++ b/tests/gem5/memory/test.py
@@ -85,6 +85,6 @@
config=joinpath(config.base_dir, 'configs',
'example', basename_noext + '.py'),
config_args=args,
-valid_isas=('NULL',),
+valid_isas=(constants.null_tag,),
valid_hosts=constants.supported_hosts,
)
diff --git a/tests/gem5/x86-boot-tests/test_linux_boot.py
b/tests/gem5/x86-boot-tests/test_linux_boot.py
index 3140595..5422425 100644
--- a/tests/gem5/x86-boot-tests/test_linux_boot.py
+++ b/tests/gem5/x86-boot-tests/test_linux_boot.py
@@ -60,7 +60,7 @@
'--num-cpus', num_cpus,
'--boot-type', boot_type,
],
-valid_isas = ('X86',),
+valid_isas = (constants.x86_tag,),
valid_hosts = host,
length = constants.long_tag,
)
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/38278
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: I4a3966168a1d159bf4ac4cc3148e9c7a43c880e3
Gerrit-Change-Number: 38278
Gerrit-PatchSet: 2
Gerrit-Owner: Bobby R. Bruce
Gerrit-Reviewer: Bobby R. Bruce
Gerrit-Reviewer: Giacomo Travaglini
Gerrit-Reviewer: Hoa Nguyen
Gerrit-Reviewer: Jason Lowe-Power
Gerrit-Reviewer: kokoro
Ger
[gem5-dev] Change in gem5/gem5[develop]: tests,arch-gcn3,arch-x86: Changed X86 testlib tests to GCN3_X86
fig_args = [], protocol = 'MSI', -valid_isas=(constants.x86_tag,), # Currently only x86 has the threads test +# Currently only x86 has the threads test +valid_isas=(constants.gcn3_x86_tag,), ) diff --git a/tests/gem5/m5_util/test_exit.py b/tests/gem5/m5_util/test_exit.py index ff900b8..1bc6e6f 100644 --- a/tests/gem5/m5_util/test_exit.py +++ b/tests/gem5/m5_util/test_exit.py @@ -59,5 +59,5 @@ fixtures=(test_program,), config=os.path.join(config.base_dir, 'configs', 'example','se.py'), config_args=['--cmd', joinpath(test_program.path, filename)], -valid_isas=(constants.x86_tag,) +valid_isas=(constants.gcn3_x86_tag,) ) diff --git a/tests/gem5/test_build/test_build.py b/tests/gem5/test_build/test_build.py index 07d8035..3a6a534 100644 --- a/tests/gem5/test_build/test_build.py +++ b/tests/gem5/test_build/test_build.py @@ -31,7 +31,7 @@ import os from testlib import * -common_isas = [constants.x86_tag, constants.arm_tag, constants.riscv_tag] +common_isas = [constants.gcn3_x86_tag, constants.arm_tag, constants.riscv_tag] for isa in constants.supported_isas: if isa is constants.null_tag: continue diff --git a/tests/gem5/x86-boot-tests/test_linux_boot.py b/tests/gem5/x86-boot-tests/test_linux_boot.py index 5422425..62f82f9 100644 --- a/tests/gem5/x86-boot-tests/test_linux_boot.py +++ b/tests/gem5/x86-boot-tests/test_linux_boot.py @@ -60,7 +60,7 @@ '--num-cpus', num_cpus, '--boot-type', boot_type, ], -valid_isas = (constants.x86_tag,), +valid_isas = (constants.gcn3_x86_tag,), valid_hosts = host, length = constants.long_tag, ) -- To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/38279 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: I2684edfc4e48c3e311a400231293a9e04c701130 Gerrit-Change-Number: 38279 Gerrit-PatchSet: 3 Gerrit-Owner: Bobby R. Bruce Gerrit-Reviewer: Bobby R. Bruce Gerrit-Reviewer: Gabe Black Gerrit-Reviewer: Jason Lowe-Power Gerrit-Reviewer: Kyle Roarty Gerrit-Reviewer: Matt Sinclair Gerrit-Reviewer: Matthew Poremba Gerrit-Reviewer: kokoro 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
[gem5-dev] Change in gem5/gem5[develop]: tests,misc: Removing cloudbuild_presubmit.yaml
Bobby R. Bruce has submitted this change. ( https://gem5-review.googlesource.com/c/public/gem5/+/38375 ) Change subject: tests,misc: Removing cloudbuild_presubmit.yaml .. tests,misc: Removing cloudbuild_presubmit.yaml This is not used. It can be removed. Change-Id: I2e25a5407ca70a18b4e619f4e65b69b98c873511 Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/38375 Reviewed-by: Jason Lowe-Power Maintainer: Jason Lowe-Power Tested-by: kokoro --- D cloudbuild_presubmit.yaml 1 file changed, 0 insertions(+), 31 deletions(-) Approvals: Jason Lowe-Power: Looks good to me, approved; Looks good to me, approved kokoro: Regressions pass diff --git a/cloudbuild_presubmit.yaml b/cloudbuild_presubmit.yaml deleted file mode 100644 index 5fd46ad..000 --- a/cloudbuild_presubmit.yaml +++ /dev/null @@ -1,31 +0,0 @@ -steps: - -- name: 'gcr.io/cloud-builders/docker' - entrypoint: 'bash' - args: - - '-c' - - | -docker pull gcr.io/$PROJECT_ID/ubuntu-18.04_all-dependencies:latest \ -|| exit 0 - -- name: 'gcr.io/cloud-builders/docker' - args: ['build', - '-t', - 'gcr.io/$PROJECT_ID/ubuntu-18.04_all-dependencies:latest', - '--cache-from', - 'gcr.io/$PROJECT_ID/ubuntu-18.04_all-dependencies:latest', - 'util/dockerfiles/ubuntu-18.04_all-dependencies'] - -- name: 'gcr.io/$PROJECT_ID/ubuntu-18.04_all-dependencies:latest' - entrypoint: 'scons' - args: ['build/NULL/unittests.opt', '-j', '4'] - -- name: 'gcr.io/$PROJECT_ID/ubuntu-18.04_all-dependencies:latest' - dir: 'tests' - entrypoint: 'python' - args: ['main.py', 'run', '-j', '4', '-t', '8', '--length', 'quick'] - -images: ['gcr.io/$PROJECT_ID/ubuntu-18.04_all-dependencies:latest'] -options: - machineType: 'N1_HIGHCPU_8' -timeout: 18000s # 5 Hours -- To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/38375 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: I2e25a5407ca70a18b4e619f4e65b69b98c873511 Gerrit-Change-Number: 38375 Gerrit-PatchSet: 2 Gerrit-Owner: Bobby R. Bruce Gerrit-Reviewer: Bobby R. Bruce Gerrit-Reviewer: Jason Lowe-Power Gerrit-Reviewer: Jason Lowe-Power Gerrit-Reviewer: kokoro 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
[gem5-dev] Change in gem5/gem5[develop]: tests,misc: Removing cloudbuild_presubmit.yaml
Bobby R. Bruce has uploaded this change for review. ( https://gem5-review.googlesource.com/c/public/gem5/+/38375 ) Change subject: tests,misc: Removing cloudbuild_presubmit.yaml .. tests,misc: Removing cloudbuild_presubmit.yaml This is not used. It can be removed. Change-Id: I2e25a5407ca70a18b4e619f4e65b69b98c873511 --- D cloudbuild_presubmit.yaml 1 file changed, 0 insertions(+), 31 deletions(-) diff --git a/cloudbuild_presubmit.yaml b/cloudbuild_presubmit.yaml deleted file mode 100644 index 5fd46ad..000 --- a/cloudbuild_presubmit.yaml +++ /dev/null @@ -1,31 +0,0 @@ -steps: - -- name: 'gcr.io/cloud-builders/docker' - entrypoint: 'bash' - args: - - '-c' - - | -docker pull gcr.io/$PROJECT_ID/ubuntu-18.04_all-dependencies:latest \ -|| exit 0 - -- name: 'gcr.io/cloud-builders/docker' - args: ['build', - '-t', - 'gcr.io/$PROJECT_ID/ubuntu-18.04_all-dependencies:latest', - '--cache-from', - 'gcr.io/$PROJECT_ID/ubuntu-18.04_all-dependencies:latest', - 'util/dockerfiles/ubuntu-18.04_all-dependencies'] - -- name: 'gcr.io/$PROJECT_ID/ubuntu-18.04_all-dependencies:latest' - entrypoint: 'scons' - args: ['build/NULL/unittests.opt', '-j', '4'] - -- name: 'gcr.io/$PROJECT_ID/ubuntu-18.04_all-dependencies:latest' - dir: 'tests' - entrypoint: 'python' - args: ['main.py', 'run', '-j', '4', '-t', '8', '--length', 'quick'] - -images: ['gcr.io/$PROJECT_ID/ubuntu-18.04_all-dependencies:latest'] -options: - machineType: 'N1_HIGHCPU_8' -timeout: 18000s # 5 Hours -- To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/38375 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: I2e25a5407ca70a18b4e619f4e65b69b98c873511 Gerrit-Change-Number: 38375 Gerrit-PatchSet: 1 Gerrit-Owner: Bobby R. Bruce Gerrit-MessageType: newchange ___ 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
[gem5-dev] Change in gem5/gem5[develop]: misc: Merge branch hotfix v20.1.0.2 branch into develop
Bobby R. Bruce has submitted this change. ( https://gem5-review.googlesource.com/c/public/gem5/+/37635 ) Change subject: misc: Merge branch hotfix v20.1.0.2 branch into develop .. misc: Merge branch hotfix v20.1.0.2 branch into develop This merge commit also reverts the version info back to 'DEVELOP-FOR-V20.2' for the develop branch. Change-Id: If6fd326cc23edf2aeaa67353d4d3fed573e9ddd6 --- M src/Doxyfile M src/base/version.cc 3 files changed, 0 insertions(+), 8 deletions(-) Approvals: Bobby R. Bruce: Looks good to me, approved; Looks good to me, approved kokoro: Regressions pass diff --git a/src/Doxyfile b/src/Doxyfile index 497a781..d453314 100644 --- a/src/Doxyfile +++ b/src/Doxyfile @@ -31,11 +31,7 @@ # This could be handy for archiving the generated documentation or # if some version control system is used. -<<<<<<< HEAD (9a01d3 dev-hsa,gpu-compute: Agent Packet handler implemented.) PROJECT_NUMBER = DEVELOP-FOR-V20.2 -=== -PROJECT_NUMBER = v20.1.0.2 ->>>>>>> BRANCH (0d7030 misc: Updated the RELEASE-NOTES and version number) # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # base path where the generated documentation will be put. diff --git a/src/base/version.cc b/src/base/version.cc index 0eb7507..cfa98f9 100644 --- a/src/base/version.cc +++ b/src/base/version.cc @@ -29,8 +29,4 @@ /** * @ingroup api_base_utils */ -<<<<<<< HEAD (9a01d3 dev-hsa,gpu-compute: Agent Packet handler implemented.) const char *gem5Version = "[DEVELOP-FOR-V20.2]"; -=== -const char *gem5Version = "20.1.0.2"; ->>>>>>> BRANCH (0d7030 misc: Updated the RELEASE-NOTES and version number) -- To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/37635 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: If6fd326cc23edf2aeaa67353d4d3fed573e9ddd6 Gerrit-Change-Number: 37635 Gerrit-PatchSet: 1 Gerrit-Owner: Bobby R. Bruce Gerrit-Reviewer: Bobby R. Bruce Gerrit-Reviewer: kokoro 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
[gem5-dev] Change in gem5/gem5[develop]: tests,misc: Added gem5.fast clang compilation to Kokoro
Bobby R. Bruce has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/37478 )
Change subject: tests,misc: Added gem5.fast clang compilation to Kokoro
..
tests,misc: Added gem5.fast clang compilation to Kokoro
Compilation issues in Clang and in compiling gem5.fast are normally
only caught during gem5's weekly, intensive, compilation checks:
http://jenkins.gem5.org/job/Compiler-Checks. The purpose of this change
is to have smaller checks on every commit, reducing the chance of
uncompilable code being submitted.
Change-Id: Idd8c6795ff73e21b1814281c31fc7ae39f09dcc5
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/37478
Tested-by: kokoro
Reviewed-by: Bobby R. Bruce
Maintainer: Bobby R. Bruce
---
M tests/jenkins/presubmit.sh
1 file changed, 14 insertions(+), 4 deletions(-)
Approvals:
Bobby R. Bruce: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/tests/jenkins/presubmit.sh b/tests/jenkins/presubmit.sh
index 68a7320..8e76d98 100755
--- a/tests/jenkins/presubmit.sh
+++ b/tests/jenkins/presubmit.sh
@@ -37,7 +37,8 @@
set -e
-DOCKER_IMAGE=gcr.io/gem5-test/ubuntu-20.04_all-dependencies
+DOCKER_IMAGE_ALL_DEP=gcr.io/gem5-test/ubuntu-20.04_all-dependencies
+DOCKER_IMAGE_CLANG_COMPILE=gcr.io/gem5-test/clang-version-9
PRESUBMIT_STAGE2=tests/jenkins/presubmit-stage2.sh
# Move the docker base directory to tempfs.
@@ -49,7 +50,16 @@
# Move the CWD to the gem5 checkout.
cd git/jenkins-gem5-prod/
-# Enter a docker image which has all the tools we need, and run the actual
-# presubmit tests.
+# Using a docker image with all the dependencies, we run the presubmit
tests.
docker run -u $UID:$GID --volume $(pwd):$(pwd) -w $(pwd) --rm \
-"${DOCKER_IMAGE}" "${PRESUBMIT_STAGE2}"
+"${DOCKER_IMAGE_ALL_DEP}" "${PRESUBMIT_STAGE2}"
+
+# DOCKER_IMAGE_ALL_DEP compiles gem5.opt with GCC. We run a compilation of
+# gem5.fast on the Clang compiler to ensure changes are compilable with the
+# clang compiler. Due to the costs of compilation, we only compile X86
+# at this point. Further compiler tests are carried out as part of our
weekly
+# "Compiler Checks" tests: http://jenkins.gem5.org/job/Compiler-Checks.
+rm -rf build
+docker run -u $UID:$GID --volume $(pwd):$(pwd) -w $(pwd) --rm \
+"${DOCKER_IMAGE_CLANG_COMPILE}" /usr/bin/env python3 /usr/bin/scons \
+build/X86/gem5.fast -j4
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/37478
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: Idd8c6795ff73e21b1814281c31fc7ae39f09dcc5
Gerrit-Change-Number: 37478
Gerrit-PatchSet: 6
Gerrit-Owner: Bobby R. Bruce
Gerrit-Reviewer: Andreas Sandberg
Gerrit-Reviewer: Anthony Gutierrez
Gerrit-Reviewer: Bobby R. Bruce
Gerrit-Reviewer: Ciro Santilli
Gerrit-Reviewer: Daniel Carvalho
Gerrit-Reviewer: Gabe Black
Gerrit-Reviewer: Giacomo Travaglini
Gerrit-Reviewer: Hoa Nguyen
Gerrit-Reviewer: Jason Lowe-Power
Gerrit-Reviewer: Matt Sinclair
Gerrit-Reviewer: Matthew Poremba
Gerrit-Reviewer: kokoro
Gerrit-Reviewer: mike upton
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
[gem5-dev] Change in gem5/gem5[develop]: sim: ScopedCheckpointSection to public for mappingParamIn
Bobby R. Bruce has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/37915 )
Change subject: sim: ScopedCheckpointSection to public for mappingParamIn
..
sim: ScopedCheckpointSection to public for mappingParamIn
In clang, the following error was given:
```
In file included from build/X86/sim/eventq.hh:51:
build/X86/sim/serialize.hh:533:19: error: 'ScopedCheckpointSection' is a
protected member of 'Serializable'
Serializable::ScopedCheckpointSection sec(os, sectionName);
^
build/X86/sim/serialize.hh:175:11: note: declared protected here
class ScopedCheckpointSection {
^
```
The use, at line 533, was introduced in this commit:
https://gem5-review.googlesource.com/c/public/gem5/+/36135
This can be fixed by making ScopedCheckpointSection public.
Change-Id: Ib6ffba18d5e8c37980d4febb548f2405cb45ce8c
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/37915
Reviewed-by: Ciro Santilli
Reviewed-by: Daniel Carvalho
Maintainer: Jason Lowe-Power
Tested-by: kokoro
---
M src/sim/serialize.hh
1 file changed, 1 insertion(+), 2 deletions(-)
Approvals:
Ciro Santilli: Looks good to me, but someone else must approve
Daniel Carvalho: Looks good to me, approved
Jason Lowe-Power: Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/sim/serialize.hh b/src/sim/serialize.hh
index 987bee2..9e25d09 100644
--- a/src/sim/serialize.hh
+++ b/src/sim/serialize.hh
@@ -171,7 +171,7 @@
*/
class Serializable
{
- protected:
+ public:
class ScopedCheckpointSection {
public:
/**
@@ -224,7 +224,6 @@
void nameOut(CheckpointIn ) {};
};
- public:
/**
* @ingroup api_serialize
*/
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/37915
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: Ib6ffba18d5e8c37980d4febb548f2405cb45ce8c
Gerrit-Change-Number: 37915
Gerrit-PatchSet: 2
Gerrit-Owner: Bobby R. Bruce
Gerrit-Reviewer: Bobby R. Bruce
Gerrit-Reviewer: Ciro Santilli
Gerrit-Reviewer: Daniel Carvalho
Gerrit-Reviewer: Giacomo Travaglini
Gerrit-Reviewer: Jason Lowe-Power
Gerrit-Reviewer: kokoro
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
[gem5-dev] Change in gem5/gem5[develop]: sim: ScopedCheckpointSection to public for mappingParamIn
Bobby R. Bruce has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/37915 )
Change subject: sim: ScopedCheckpointSection to public for mappingParamIn
..
sim: ScopedCheckpointSection to public for mappingParamIn
In clang, the following error was given:
```
In file included from build/X86/sim/eventq.hh:51:
build/X86/sim/serialize.hh:533:19: error: 'ScopedCheckpointSection' is a
protected member of 'Serializable'
Serializable::ScopedCheckpointSection sec(os, sectionName);
^
build/X86/sim/serialize.hh:175:11: note: declared protected here
class ScopedCheckpointSection {
^
```
The use, at line 533, was introduced in this commit:
https://gem5-review.googlesource.com/c/public/gem5/+/36135
This can be fixed by making ScopedCheckpointSection public.
Change-Id: Ib6ffba18d5e8c37980d4febb548f2405cb45ce8c
---
M src/sim/serialize.hh
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/sim/serialize.hh b/src/sim/serialize.hh
index 987bee2..9e25d09 100644
--- a/src/sim/serialize.hh
+++ b/src/sim/serialize.hh
@@ -171,7 +171,7 @@
*/
class Serializable
{
- protected:
+ public:
class ScopedCheckpointSection {
public:
/**
@@ -224,7 +224,6 @@
void nameOut(CheckpointIn ) {};
};
- public:
/**
* @ingroup api_serialize
*/
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/37915
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: Ib6ffba18d5e8c37980d4febb548f2405cb45ce8c
Gerrit-Change-Number: 37915
Gerrit-PatchSet: 1
Gerrit-Owner: Bobby R. Bruce
Gerrit-MessageType: newchange
___
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
[gem5-dev] Change in gem5/gem5[develop]: arch-gcn3,misc: Added missing overrides to gpu_thread.hh
Bobby R. Bruce has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/37538 )
Change subject: arch-gcn3,misc: Added missing overrides to gpu_thread.hh
..
arch-gcn3,misc: Added missing overrides to gpu_thread.hh
Compiling GCN3 with clang will result in errors within this change.
Change-Id: I05fea6f84f988cb22505281fa24e72d615959f7a
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/37538
Maintainer: Bobby R. Bruce
Tested-by: kokoro
Reviewed-by: Matthew Poremba
---
M src/cpu/testers/gpu_ruby_test/gpu_thread.hh
1 file changed, 9 insertions(+), 4 deletions(-)
Approvals:
Matthew Poremba: Looks good to me, approved
Bobby R. Bruce: Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/cpu/testers/gpu_ruby_test/gpu_thread.hh
b/src/cpu/testers/gpu_ruby_test/gpu_thread.hh
index 00a69be..1c9fedc 100644
--- a/src/cpu/testers/gpu_ruby_test/gpu_thread.hh
+++ b/src/cpu/testers/gpu_ruby_test/gpu_thread.hh
@@ -90,8 +90,8 @@
: Event(CPU_Tick_Pri), thread(_thread), desc(_description)
{}
void setDesc(std::string _description) { desc = _description; }
-void process() { thread->wakeup(); }
-const std::string name() { return desc; }
+void process() override { thread->wakeup(); }
+const std::string name() const override { return desc; }
};
GpuThreadEvent threadEvent;
@@ -105,8 +105,13 @@
DeadlockCheckEvent(GpuThread* _thread)
: Event(CPU_Tick_Pri), thread(_thread)
{}
-void process() { thread->checkDeadlock(); }
-const std::string name() const { return "Tester deadlock check"; }
+void process() override { thread->checkDeadlock(); }
+
+const std::string
+name() const override
+{
+return "Tester deadlock check";
+}
};
DeadlockCheckEvent deadlockCheckEvent;
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/37538
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: I05fea6f84f988cb22505281fa24e72d615959f7a
Gerrit-Change-Number: 37538
Gerrit-PatchSet: 4
Gerrit-Owner: Bobby R. Bruce
Gerrit-Reviewer: Bobby R. Bruce
Gerrit-Reviewer: Kyle Roarty
Gerrit-Reviewer: Matt Sinclair
Gerrit-Reviewer: Matthew Poremba
Gerrit-Reviewer: Tuan Ta
Gerrit-Reviewer: kokoro
Gerrit-CC: Anthony Gutierrez
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
[gem5-dev] Change in gem5/gem5[develop]: mem-cache,misc: Added missing override to operator
Bobby R. Bruce has submitted this change. ( https://gem5-review.googlesource.com/c/public/gem5/+/37535 ) Change subject: mem-cache,misc: Added missing override to operator .. mem-cache,misc: Added missing override to operator Clang compilation was failing in error due to this missing override. Change-Id: I92f1774cd2f1f5ef90ab1d72d038f6c65cba70ad Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/37535 Reviewed-by: Hoa Nguyen Reviewed-by: Daniel Carvalho Maintainer: Bobby R. Bruce Tested-by: kokoro --- M src/mem/cache/tags/super_blk.hh 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Daniel Carvalho: Looks good to me, approved Hoa Nguyen: Looks good to me, approved Bobby R. Bruce: Looks good to me, approved kokoro: Regressions pass diff --git a/src/mem/cache/tags/super_blk.hh b/src/mem/cache/tags/super_blk.hh index 64d73bd..1ffd0f7 100644 --- a/src/mem/cache/tags/super_blk.hh +++ b/src/mem/cache/tags/super_blk.hh @@ -90,7 +90,7 @@ * variables will remain the same. */ CompressionBlk& operator=(CompressionBlk&& other); -CacheBlk& operator=(CacheBlk&& other); +CacheBlk& operator=(CacheBlk&& other) override; ~CompressionBlk() = default; /** -- To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/37535 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: I92f1774cd2f1f5ef90ab1d72d038f6c65cba70ad Gerrit-Change-Number: 37535 Gerrit-PatchSet: 2 Gerrit-Owner: Bobby R. Bruce Gerrit-Reviewer: Bobby R. Bruce Gerrit-Reviewer: Daniel Carvalho Gerrit-Reviewer: Hoa Nguyen Gerrit-Reviewer: Jason Lowe-Power Gerrit-Reviewer: Nikos Nikoleris Gerrit-Reviewer: kokoro 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
[gem5-dev] Change in gem5/gem5[develop]: arch-gcn3, misc: Added missing override to protocol_tester.hh
Bobby R. Bruce has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/37537 )
Change subject: arch-gcn3, misc: Added missing override to
protocol_tester.hh
..
arch-gcn3, misc: Added missing override to protocol_tester.hh
Clang will return a missing-override error when compiling X86_GCN4
without this change.
Change-Id: Ib5fd9ba5c27ddc15561198bfc90d27b7599a7923
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/37537
Reviewed-by: Hoa Nguyen
Maintainer: Bobby R. Bruce
Tested-by: kokoro
---
M src/cpu/testers/gpu_ruby_test/protocol_tester.hh
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Hoa Nguyen: Looks good to me, approved
Bobby R. Bruce: Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/cpu/testers/gpu_ruby_test/protocol_tester.hh
b/src/cpu/testers/gpu_ruby_test/protocol_tester.hh
index 6109e5a..1d01fd2 100644
--- a/src/cpu/testers/gpu_ruby_test/protocol_tester.hh
+++ b/src/cpu/testers/gpu_ruby_test/protocol_tester.hh
@@ -117,7 +117,7 @@
typedef AddressManager::Location Location;
typedef AddressManager::Value Value;
-void init();
+void init() override;
RequestorID requestorId() { return _requestorId; };
Port& getPort(const std::string _name,
PortID idx=InvalidPortID) override;
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/37537
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: Ib5fd9ba5c27ddc15561198bfc90d27b7599a7923
Gerrit-Change-Number: 37537
Gerrit-PatchSet: 2
Gerrit-Owner: Bobby R. Bruce
Gerrit-Reviewer: Bobby R. Bruce
Gerrit-Reviewer: Hoa Nguyen
Gerrit-Reviewer: Jason Lowe-Power
Gerrit-Reviewer: kokoro
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
[gem5-dev] Change in gem5/gem5[develop]: arch-sparc,misc: Added M5_VAR_USED to SparcProcess var
Bobby R. Bruce has submitted this change. ( https://gem5-review.googlesource.com/c/public/gem5/+/37536 ) Change subject: arch-sparc,misc: Added M5_VAR_USED to SparcProcess var .. arch-sparc,misc: Added M5_VAR_USED to SparcProcess var Compiling sparc/gem5.fast fails without specifying this variable is used. Change-Id: I86aa5c6495de111421458c2b62200ddb2a89076e Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/37536 Reviewed-by: Gabe Black Reviewed-by: Bobby R. Bruce Maintainer: Gabe Black Tested-by: kokoro --- M src/arch/sparc/faults.cc 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Gabe Black: Looks good to me, but someone else must approve; Looks good to me, approved Bobby R. Bruce: Looks good to me, approved kokoro: Regressions pass diff --git a/src/arch/sparc/faults.cc b/src/arch/sparc/faults.cc index 53e7576..b480558 100644 --- a/src/arch/sparc/faults.cc +++ b/src/arch/sparc/faults.cc @@ -814,7 +814,7 @@ Process *p = tc->getProcessPtr(); -SparcProcess *sp = dynamic_cast(p); +M5_VAR_USED SparcProcess *sp = dynamic_cast(p); assert(sp); auto *workload = dynamic_cast*>(tc->getSystemPtr()->workload); -- To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/37536 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: I86aa5c6495de111421458c2b62200ddb2a89076e Gerrit-Change-Number: 37536 Gerrit-PatchSet: 2 Gerrit-Owner: Bobby R. Bruce Gerrit-Reviewer: Bobby R. Bruce Gerrit-Reviewer: Gabe Black Gerrit-Reviewer: Hoa Nguyen Gerrit-Reviewer: Jason Lowe-Power Gerrit-Reviewer: kokoro 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
[gem5-dev] Change in gem5/gem5[develop]: misc: Merge branch hotfix v20.1.0.2 branch into develop
Bobby R. Bruce has uploaded this change for review. ( https://gem5-review.googlesource.com/c/public/gem5/+/37635 ) Change subject: misc: Merge branch hotfix v20.1.0.2 branch into develop .. misc: Merge branch hotfix v20.1.0.2 branch into develop This merge commit also reverts the version info back to 'DEVELOP-FOR-V20.2' for the develop branch. Change-Id: If6fd326cc23edf2aeaa67353d4d3fed573e9ddd6 --- M src/Doxyfile M src/base/version.cc 3 files changed, 0 insertions(+), 8 deletions(-) diff --git a/src/Doxyfile b/src/Doxyfile index 497a781..d453314 100644 --- a/src/Doxyfile +++ b/src/Doxyfile @@ -31,11 +31,7 @@ # This could be handy for archiving the generated documentation or # if some version control system is used. -<<<<<<< HEAD (9a01d3 dev-hsa,gpu-compute: Agent Packet handler implemented.) PROJECT_NUMBER = DEVELOP-FOR-V20.2 -=== -PROJECT_NUMBER = v20.1.0.2 ->>>>>>> BRANCH (0d7030 misc: Updated the RELEASE-NOTES and version number) # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # base path where the generated documentation will be put. diff --git a/src/base/version.cc b/src/base/version.cc index 0eb7507..cfa98f9 100644 --- a/src/base/version.cc +++ b/src/base/version.cc @@ -29,8 +29,4 @@ /** * @ingroup api_base_utils */ -<<<<<<< HEAD (9a01d3 dev-hsa,gpu-compute: Agent Packet handler implemented.) const char *gem5Version = "[DEVELOP-FOR-V20.2]"; -=== -const char *gem5Version = "20.1.0.2"; ->>>>>>> BRANCH (0d7030 misc: Updated the RELEASE-NOTES and version number) -- To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/37635 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: If6fd326cc23edf2aeaa67353d4d3fed573e9ddd6 Gerrit-Change-Number: 37635 Gerrit-PatchSet: 1 Gerrit-Owner: Bobby R. Bruce Gerrit-MessageType: newchange ___ 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
[gem5-dev] Change in gem5/gem5[hotfix-memorysize-division]: misc: Updated the RELEASE-NOTES and version number
Bobby R. Bruce has submitted this change. ( https://gem5-review.googlesource.com/c/public/gem5/+/37435 ) Change subject: misc: Updated the RELEASE-NOTES and version number .. misc: Updated the RELEASE-NOTES and version number Updated the RELEASE-NOTES.md and version number for the v20.1.0.2 hotfix release. Change-Id: Ibb6b62a36bd1f9084f7d8311ff1f94b8564dbe9b Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/37435 Reviewed-by: Bobby R. Bruce Maintainer: Bobby R. Bruce Tested-by: kokoro --- M RELEASE-NOTES.md M src/Doxyfile M src/base/version.cc 3 files changed, 9 insertions(+), 2 deletions(-) Approvals: Bobby R. Bruce: Looks good to me, approved; Looks good to me, approved kokoro: Regressions pass diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md index 46c8795..71934a7 100644 --- a/RELEASE-NOTES.md +++ b/RELEASE-NOTES.md @@ -1,3 +1,10 @@ +# Version 20.1.0.2 + +**[HOTFIX]** This hotfix release fixes known two bugs: + +* A "ValueError: invalid literal for int() with base..." error was being thrown in certain circumstances due to a non-integer being passed to "MemorySize" via a division operation. This has been rectified. +* An assertion in Stats could be triggered due to a name collision between two ThreadStateStats objects, due to both erroneously sharing the same ThreadID. This has been fixed. + # Version 20.1.0.1 **[HOTFIX]** A patch was applied to fix the Garnet network interface stats. diff --git a/src/Doxyfile b/src/Doxyfile index 83770d5..b934639 100644 --- a/src/Doxyfile +++ b/src/Doxyfile @@ -31,7 +31,7 @@ # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = v20.1.0.1 +PROJECT_NUMBER = v20.1.0.2 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # base path where the generated documentation will be put. diff --git a/src/base/version.cc b/src/base/version.cc index 3ad07fa..304ccc1 100644 --- a/src/base/version.cc +++ b/src/base/version.cc @@ -29,4 +29,4 @@ /** * @ingroup api_base_utils */ -const char *gem5Version = "20.1.0.1"; +const char *gem5Version = "20.1.0.2"; -- To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/37435 To unsubscribe, or for help writing mail filters, visit https://gem5-review.googlesource.com/settings Gerrit-Project: public/gem5 Gerrit-Branch: hotfix-memorysize-division Gerrit-Change-Id: Ibb6b62a36bd1f9084f7d8311ff1f94b8564dbe9b Gerrit-Change-Number: 37435 Gerrit-PatchSet: 4 Gerrit-Owner: Bobby R. Bruce Gerrit-Reviewer: Bobby R. Bruce Gerrit-Reviewer: kokoro 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
[gem5-dev] Change in gem5/gem5[develop]: arch-sparc,misc: Added M5_VAR_USED to SparcProcess var
Bobby R. Bruce has uploaded this change for review. ( https://gem5-review.googlesource.com/c/public/gem5/+/37536 ) Change subject: arch-sparc,misc: Added M5_VAR_USED to SparcProcess var .. arch-sparc,misc: Added M5_VAR_USED to SparcProcess var Compiling sparc/gem5.fast fails without specifying this variable is used. Change-Id: I86aa5c6495de111421458c2b62200ddb2a89076e --- M src/arch/sparc/faults.cc 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/arch/sparc/faults.cc b/src/arch/sparc/faults.cc index 53e7576..b480558 100644 --- a/src/arch/sparc/faults.cc +++ b/src/arch/sparc/faults.cc @@ -814,7 +814,7 @@ Process *p = tc->getProcessPtr(); -SparcProcess *sp = dynamic_cast(p); +M5_VAR_USED SparcProcess *sp = dynamic_cast(p); assert(sp); auto *workload = dynamic_cast*>(tc->getSystemPtr()->workload); -- To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/37536 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: I86aa5c6495de111421458c2b62200ddb2a89076e Gerrit-Change-Number: 37536 Gerrit-PatchSet: 1 Gerrit-Owner: Bobby R. Bruce Gerrit-MessageType: newchange ___ 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
[gem5-dev] Change in gem5/gem5[develop]: arch-gcn3,misc: Added missing overrides to gpu_thread.hh
Bobby R. Bruce has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/37538 )
Change subject: arch-gcn3,misc: Added missing overrides to gpu_thread.hh
..
arch-gcn3,misc: Added missing overrides to gpu_thread.hh
Compiling GCN3 with clang will result in errors within this change.
Change-Id: I05fea6f84f988cb22505281fa24e72d615959f7a
---
M src/cpu/testers/gpu_ruby_test/gpu_thread.hh
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/cpu/testers/gpu_ruby_test/gpu_thread.hh
b/src/cpu/testers/gpu_ruby_test/gpu_thread.hh
index 00a69be..c81b421 100644
--- a/src/cpu/testers/gpu_ruby_test/gpu_thread.hh
+++ b/src/cpu/testers/gpu_ruby_test/gpu_thread.hh
@@ -90,8 +90,8 @@
: Event(CPU_Tick_Pri), thread(_thread), desc(_description)
{}
void setDesc(std::string _description) { desc = _description; }
-void process() { thread->wakeup(); }
-const std::string name() { return desc; }
+void process() override { thread->wakeup(); }
+const std::string name() const override { return desc; }
};
GpuThreadEvent threadEvent;
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/37538
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: I05fea6f84f988cb22505281fa24e72d615959f7a
Gerrit-Change-Number: 37538
Gerrit-PatchSet: 1
Gerrit-Owner: Bobby R. Bruce
Gerrit-MessageType: newchange
___
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
[gem5-dev] Change in gem5/gem5[develop]: arch-gcn3, misc: Added missing override to protocol_tester.hh
Bobby R. Bruce has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/37537 )
Change subject: arch-gcn3, misc: Added missing override to
protocol_tester.hh
..
arch-gcn3, misc: Added missing override to protocol_tester.hh
Clang will return a missing-override error when compiling X86_GCN4
without this change.
Change-Id: Ib5fd9ba5c27ddc15561198bfc90d27b7599a7923
---
M src/cpu/testers/gpu_ruby_test/protocol_tester.hh
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/cpu/testers/gpu_ruby_test/protocol_tester.hh
b/src/cpu/testers/gpu_ruby_test/protocol_tester.hh
index 6109e5a..1d01fd2 100644
--- a/src/cpu/testers/gpu_ruby_test/protocol_tester.hh
+++ b/src/cpu/testers/gpu_ruby_test/protocol_tester.hh
@@ -117,7 +117,7 @@
typedef AddressManager::Location Location;
typedef AddressManager::Value Value;
-void init();
+void init() override;
RequestorID requestorId() { return _requestorId; };
Port& getPort(const std::string _name,
PortID idx=InvalidPortID) override;
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/37537
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: Ib5fd9ba5c27ddc15561198bfc90d27b7599a7923
Gerrit-Change-Number: 37537
Gerrit-PatchSet: 1
Gerrit-Owner: Bobby R. Bruce
Gerrit-MessageType: newchange
___
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
[gem5-dev] Change in gem5/gem5[develop]: mem-cache,misc: Added missing override to operator
Bobby R. Bruce has uploaded this change for review. ( https://gem5-review.googlesource.com/c/public/gem5/+/37535 ) Change subject: mem-cache,misc: Added missing override to operator .. mem-cache,misc: Added missing override to operator Clang compilation was failing in error due to this missing override. Change-Id: I92f1774cd2f1f5ef90ab1d72d038f6c65cba70ad --- M src/mem/cache/tags/super_blk.hh 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mem/cache/tags/super_blk.hh b/src/mem/cache/tags/super_blk.hh index 64d73bd..1ffd0f7 100644 --- a/src/mem/cache/tags/super_blk.hh +++ b/src/mem/cache/tags/super_blk.hh @@ -90,7 +90,7 @@ * variables will remain the same. */ CompressionBlk& operator=(CompressionBlk&& other); -CacheBlk& operator=(CacheBlk&& other); +CacheBlk& operator=(CacheBlk&& other) override; ~CompressionBlk() = default; /** -- To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/37535 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: I92f1774cd2f1f5ef90ab1d72d038f6c65cba70ad Gerrit-Change-Number: 37535 Gerrit-PatchSet: 1 Gerrit-Owner: Bobby R. Bruce Gerrit-MessageType: newchange ___ 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
[gem5-dev] Change in gem5/gem5[hotfix-memorysize-division]: cpu,stats: Fix incorrect stat names of ThreadStateStats
Bobby R. Bruce has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/37455 )
Change subject: cpu,stats: Fix incorrect stat names of ThreadStateStats
..
cpu,stats: Fix incorrect stat names of ThreadStateStats
Previously, ThreadStateStats uses ThreadState::threadId() to
determine the name of the stats. However, in the ThreadState
constructor, ThreadStateStats is initialized before ThreadState
is intialized. As a result, the name of ThreadStateStats has
a wrong ThreadID.
This commit uses ThreadID instead of ThreadState to determine
the name of the stats.
This causes a name collision between ThreadStateStats and
ExecContextStats as both have the name of "thread_[tid]".
Ideally, those stats should be merged to the BaseSimpleCPU.
However, both ThreadStateStats and ExecContextStats have
a stat named numInsts. So, for now, ExecContextStats will
have a name of "exec_context.thread_[tid]", while ThreadStateStats
keeps its name.
Change-Id: If9a21549f98bd6e3ce6dc29bdf183e8fd5f51a67
Signed-off-by: Hoa Nguyen
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/37455
Reviewed-by: Bobby R. Bruce
Maintainer: Bobby R. Bruce
Tested-by: kokoro
---
M src/cpu/thread_state.cc
M src/cpu/thread_state.hh
2 files changed, 4 insertions(+), 4 deletions(-)
Approvals:
Bobby R. Bruce: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/cpu/thread_state.cc b/src/cpu/thread_state.cc
index a142f57..5e59eb2 100644
--- a/src/cpu/thread_state.cc
+++ b/src/cpu/thread_state.cc
@@ -39,7 +39,7 @@
#include "sim/system.hh"
ThreadState::ThreadState(BaseCPU *cpu, ThreadID _tid, Process *_process)
-: numInst(0), numOp(0), threadStats(cpu, this),
+: numInst(0), numOp(0), threadStats(cpu, _tid),
numLoad(0), startNumLoad(0),
_status(ThreadContext::Halted), baseCpu(cpu),
_contextId(0), _threadId(_tid), lastActivate(0), lastSuspend(0),
@@ -119,8 +119,8 @@
}
ThreadState::ThreadStateStats::ThreadStateStats(BaseCPU *cpu,
-ThreadState *thread)
- : Stats::Group(cpu, csprintf("thread%i",
thread->threadId()).c_str()),
+const ThreadID& tid)
+ : Stats::Group(cpu, csprintf("thread_%i", tid).c_str()),
ADD_STAT(numInsts, "Number of Instructions committed"),
ADD_STAT(numOps, "Number of Ops committed"),
ADD_STAT(numMemRefs, "Number of Memory References")
diff --git a/src/cpu/thread_state.hh b/src/cpu/thread_state.hh
index 3ac473d..53817c8 100644
--- a/src/cpu/thread_state.hh
+++ b/src/cpu/thread_state.hh
@@ -111,7 +111,7 @@
// Defining the stat group
struct ThreadStateStats : public Stats::Group
{
-ThreadStateStats(BaseCPU *cpu, ThreadState *thread);
+ThreadStateStats(BaseCPU *cpu, const ThreadID& thread);
/** Stat for number instructions committed. */
Stats::Scalar numInsts;
/** Stat for number ops (including micro ops) committed. */
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/37455
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: hotfix-memorysize-division
Gerrit-Change-Id: If9a21549f98bd6e3ce6dc29bdf183e8fd5f51a67
Gerrit-Change-Number: 37455
Gerrit-PatchSet: 2
Gerrit-Owner: Bobby R. Bruce
Gerrit-Reviewer: Bobby R. Bruce
Gerrit-Reviewer: Gabe Black
Gerrit-Reviewer: Hoa Nguyen
Gerrit-Reviewer: kokoro
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
[gem5-dev] Change in gem5/gem5[develop]: tests,misc: Added gem5.fast clang compilation to Kokoro
Bobby R. Bruce has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/37478 )
Change subject: tests,misc: Added gem5.fast clang compilation to Kokoro
..
tests,misc: Added gem5.fast clang compilation to Kokoro
Compilation issues in Clang and in compiling gem5.fast are normally
only caught during gem5's weekly, intensive, compilation checks:
http://jenkins.gem5.org/job/Compiler-Checks. The purpose of this change
is to have smaller checks on every commit, reducing the chance of
uncompilable code being submitted.
Change-Id: Idd8c6795ff73e21b1814281c31fc7ae39f09dcc5
---
M tests/jenkins/presubmit.sh
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/tests/jenkins/presubmit.sh b/tests/jenkins/presubmit.sh
index 68a7320..79fde53 100755
--- a/tests/jenkins/presubmit.sh
+++ b/tests/jenkins/presubmit.sh
@@ -37,7 +37,8 @@
set -e
-DOCKER_IMAGE=gcr.io/gem5-test/ubuntu-20.04_all-dependencies
+DOCKER_IMAGE_ALL_DEP=gcr.io/gem5-test/ubuntu-20.04_all-dependencies
+DOCKER_IMAGE_CLANG_COMPILE=gcr.io/gem5-test/clang-version-9
PRESUBMIT_STAGE2=tests/jenkins/presubmit-stage2.sh
# Move the docker base directory to tempfs.
@@ -52,4 +53,13 @@
# Enter a docker image which has all the tools we need, and run the actual
# presubmit tests.
docker run -u $UID:$GID --volume $(pwd):$(pwd) -w $(pwd) --rm \
-"${DOCKER_IMAGE}" "${PRESUBMIT_STAGE2}"
+"${DOCKER_IMAGE_ALL_DEP}" "${PRESUBMIT_STAGE2}"
+
+# DOCKER_IMAGE_ALL_DEP compiles gem5.opt with GCC. We run a compilation of
+# gem5.fast on the Clang compiler to ensure changes are compilable with the
+# clang compiler. Due to the costs of compilation, we only compile X86
+# at this point. Further compiler tests are carried out nightly as part of
+# our weekly "Compiler Check" tests:
+# http://jenkins.gem5.org/job/Compiler-Checks
+docker run -u $UID:$GID --volume $(pwd):$(pwd) -w $(pwd) --rm \
+"${DOCKER_IMAGE_ALL_DEP}" scons build/X86/gem5.fast -j4
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/37478
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: Idd8c6795ff73e21b1814281c31fc7ae39f09dcc5
Gerrit-Change-Number: 37478
Gerrit-PatchSet: 1
Gerrit-Owner: Bobby R. Bruce
Gerrit-MessageType: newchange
___
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
[gem5-dev] Change in gem5/gem5[hotfix-memorysize-division]: cpu,stats: Fix incorrect stat names of ThreadStateStats
Attention is currently required from: Hoa Nguyen.
Hello Hoa Nguyen,
I'd like you to do a code review. Please visit
https://gem5-review.googlesource.com/c/public/gem5/+/37455
to review the following change.
Change subject: cpu,stats: Fix incorrect stat names of ThreadStateStats
..
cpu,stats: Fix incorrect stat names of ThreadStateStats
Previously, ThreadStateStats uses ThreadState::threadId() to
determine the name of the stats. However, in the ThreadState
constructor, ThreadStateStats is initialized before ThreadState
is intialized. As a result, the name of ThreadStateStats has
a wrong ThreadID.
This commit uses ThreadID instead of ThreadState to determine
the name of the stats.
This causes a name collision between ThreadStateStats and
ExecContextStats as both have the name of "thread_[tid]".
Ideally, those stats should be merged to the BaseSimpleCPU.
However, both ThreadStateStats and ExecContextStats have
a stat named numInsts. So, for now, ExecContextStats will
have a name of "exec_context.thread_[tid]", while ThreadStateStats
keeps its name.
Change-Id: If9a21549f98bd6e3ce6dc29bdf183e8fd5f51a67
Signed-off-by: Hoa Nguyen
---
M src/cpu/thread_state.cc
M src/cpu/thread_state.hh
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/cpu/thread_state.cc b/src/cpu/thread_state.cc
index a142f57..5e59eb2 100644
--- a/src/cpu/thread_state.cc
+++ b/src/cpu/thread_state.cc
@@ -39,7 +39,7 @@
#include "sim/system.hh"
ThreadState::ThreadState(BaseCPU *cpu, ThreadID _tid, Process *_process)
-: numInst(0), numOp(0), threadStats(cpu, this),
+: numInst(0), numOp(0), threadStats(cpu, _tid),
numLoad(0), startNumLoad(0),
_status(ThreadContext::Halted), baseCpu(cpu),
_contextId(0), _threadId(_tid), lastActivate(0), lastSuspend(0),
@@ -119,8 +119,8 @@
}
ThreadState::ThreadStateStats::ThreadStateStats(BaseCPU *cpu,
-ThreadState *thread)
- : Stats::Group(cpu, csprintf("thread%i",
thread->threadId()).c_str()),
+const ThreadID& tid)
+ : Stats::Group(cpu, csprintf("thread_%i", tid).c_str()),
ADD_STAT(numInsts, "Number of Instructions committed"),
ADD_STAT(numOps, "Number of Ops committed"),
ADD_STAT(numMemRefs, "Number of Memory References")
diff --git a/src/cpu/thread_state.hh b/src/cpu/thread_state.hh
index 3ac473d..53817c8 100644
--- a/src/cpu/thread_state.hh
+++ b/src/cpu/thread_state.hh
@@ -111,7 +111,7 @@
// Defining the stat group
struct ThreadStateStats : public Stats::Group
{
-ThreadStateStats(BaseCPU *cpu, ThreadState *thread);
+ThreadStateStats(BaseCPU *cpu, const ThreadID& thread);
/** Stat for number instructions committed. */
Stats::Scalar numInsts;
/** Stat for number ops (including micro ops) committed. */
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/37455
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: hotfix-memorysize-division
Gerrit-Change-Id: If9a21549f98bd6e3ce6dc29bdf183e8fd5f51a67
Gerrit-Change-Number: 37455
Gerrit-PatchSet: 1
Gerrit-Owner: Bobby R. Bruce
Gerrit-Reviewer: Hoa Nguyen
Gerrit-Attention: Hoa Nguyen
Gerrit-MessageType: newchange
___
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
[gem5-dev] Change in gem5/gem5[develop]: misc: Updated MAINTAINERS.yaml
Bobby R. Bruce has submitted this change. ( https://gem5-review.googlesource.com/c/public/gem5/+/37356 ) Change subject: misc: Updated MAINTAINERS.yaml .. misc: Updated MAINTAINERS.yaml Change-Id: Ibda441858a22c9e8bb22e132c165e7724aaf7539 Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/37356 Reviewed-by: Jason Lowe-Power Reviewed-by: Daniel Carvalho Reviewed-by: Matt Sinclair Reviewed-by: Matthew Poremba Maintainer: Jason Lowe-Power Maintainer: Matt Sinclair Maintainer: Bobby R. Bruce Tested-by: kokoro --- M MAINTAINERS.yaml 1 file changed, 11 insertions(+), 2 deletions(-) Approvals: Jason Lowe-Power: Looks good to me, but someone else must approve; Looks good to me, approved Matthew Poremba: Looks good to me, approved Matt Sinclair: Looks good to me, but someone else must approve; Looks good to me, approved Daniel Carvalho: Looks good to me, approved Bobby R. Bruce: Looks good to me, approved kokoro: Regressions pass diff --git a/MAINTAINERS.yaml b/MAINTAINERS.yaml index 8a2bf75..068da7f 100644 --- a/MAINTAINERS.yaml +++ b/MAINTAINERS.yaml @@ -63,7 +63,10 @@ - Giacomo Travaglini arch-gcn3: - status: orphaned + status: maintained + maintainers: +- Matt Poremba +- Matt Sinclair arch-mips: status: orphaned @@ -90,6 +93,7 @@ status: maintained maintainers: - Bobby Bruce +- Daniel Carvalho base-stats: status: orphaned @@ -132,7 +136,9 @@ - Gabe Black dev-hsa: - status: orphaned + status: maintained + maintainers: +- Matt Poremba dev-virtio: status: maintained @@ -175,6 +181,7 @@ status: maintained maintainers: - Matt Poremba +- Matt Sinclair learning-gem5: desc: >- @@ -196,6 +203,7 @@ status: maintained maintainers: - Nikos Nikoleris +- Daniel Carvalho mem-dram: status: maintained @@ -215,6 +223,7 @@ status: maintained maintainers: - Jason Lowe-Power +- Matt Sinclair misc: desc: >- -- To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/37356 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: Ibda441858a22c9e8bb22e132c165e7724aaf7539 Gerrit-Change-Number: 37356 Gerrit-PatchSet: 2 Gerrit-Owner: Bobby R. Bruce Gerrit-Reviewer: Bobby R. Bruce Gerrit-Reviewer: Daniel Carvalho Gerrit-Reviewer: Jason Lowe-Power Gerrit-Reviewer: Matt Sinclair Gerrit-Reviewer: Matthew Poremba Gerrit-Reviewer: kokoro 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
[gem5-dev] Change in gem5/gem5[hotfix-memorysize-division]: misc: Updated the RELEASE-NOTES and version number
Bobby R. Bruce has uploaded this change for review. ( https://gem5-review.googlesource.com/c/public/gem5/+/37435 ) Change subject: misc: Updated the RELEASE-NOTES and version number .. misc: Updated the RELEASE-NOTES and version number Updated the RELEASE-NOTES.md and version number for the v20.1.0.2 hotfix release. Change-Id: Ibb6b62a36bd1f9084f7d8311ff1f94b8564dbe9b --- M RELEASE-NOTES.md M src/Doxyfile M src/base/version.cc 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md index 46c8795..ec4636f 100644 --- a/RELEASE-NOTES.md +++ b/RELEASE-NOTES.md @@ -1,3 +1,8 @@ +# Version 20.1.0.2 + +**[HOTFIX]** A "ValueError: invalid literal for int() with base..." error was being thrown in certain circumstances due to a non-integer being passed to "MemorySize" via a division. +This hotfix release fixes this bug. + # Version 20.1.0.1 **[HOTFIX]** A patch was applied to fix the Garnet network interface stats. diff --git a/src/Doxyfile b/src/Doxyfile index 83770d5..b934639 100644 --- a/src/Doxyfile +++ b/src/Doxyfile @@ -31,7 +31,7 @@ # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = v20.1.0.1 +PROJECT_NUMBER = v20.1.0.2 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # base path where the generated documentation will be put. diff --git a/src/base/version.cc b/src/base/version.cc index 3ad07fa..304ccc1 100644 --- a/src/base/version.cc +++ b/src/base/version.cc @@ -29,4 +29,4 @@ /** * @ingroup api_base_utils */ -const char *gem5Version = "20.1.0.1"; +const char *gem5Version = "20.1.0.2"; -- To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/37435 To unsubscribe, or for help writing mail filters, visit https://gem5-review.googlesource.com/settings Gerrit-Project: public/gem5 Gerrit-Branch: hotfix-memorysize-division Gerrit-Change-Id: Ibb6b62a36bd1f9084f7d8311ff1f94b8564dbe9b Gerrit-Change-Number: 37435 Gerrit-PatchSet: 1 Gerrit-Owner: Bobby R. Bruce Gerrit-MessageType: newchange ___ 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
[gem5-dev] Change in gem5/gem5[develop]: dev-arm,misc: Added missing override to scmi_platform functions
Bobby R. Bruce has submitted this change. ( https://gem5-review.googlesource.com/c/public/gem5/+/37355 ) Change subject: dev-arm,misc: Added missing override to scmi_platform functions .. dev-arm,misc: Added missing override to scmi_platform functions The missing overrides on the "raiseInterrupt" and "clearInterrupt" resulted in compilation failures when using Clang. Change-Id: Ic77e8587cd622f8f0cb819c3230893a1b169a2a2 Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/37355 Reviewed-by: Jason Lowe-Power Reviewed-by: Giacomo Travaglini Maintainer: Jason Lowe-Power Tested-by: kokoro --- M src/dev/arm/css/scmi_platform.hh 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jason Lowe-Power: Looks good to me, but someone else must approve; Looks good to me, approved Giacomo Travaglini: Looks good to me, approved kokoro: Regressions pass diff --git a/src/dev/arm/css/scmi_platform.hh b/src/dev/arm/css/scmi_platform.hh index b46cfb0..567e548 100644 --- a/src/dev/arm/css/scmi_platform.hh +++ b/src/dev/arm/css/scmi_platform.hh @@ -292,8 +292,8 @@ Port& getPort(const std::string _name, PortID idx) override; -void raiseInterrupt(const Doorbell *doorbell); -void clearInterrupt(const Doorbell *doorbell); +void raiseInterrupt(const Doorbell *doorbell) override; +void clearInterrupt(const Doorbell *doorbell) override; static uint32_t protocolID(const Message ) -- To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/37355 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: Ic77e8587cd622f8f0cb819c3230893a1b169a2a2 Gerrit-Change-Number: 37355 Gerrit-PatchSet: 2 Gerrit-Owner: Bobby R. Bruce Gerrit-Reviewer: Andreas Sandberg Gerrit-Reviewer: Bobby R. Bruce Gerrit-Reviewer: Giacomo Travaglini Gerrit-Reviewer: Jason Lowe-Power Gerrit-Reviewer: kokoro 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
[gem5-dev] Change in gem5/gem5[develop]: misc: Updated MAINTAINERS.yaml
Bobby R. Bruce has uploaded this change for review. ( https://gem5-review.googlesource.com/c/public/gem5/+/37356 ) Change subject: misc: Updated MAINTAINERS.yaml .. misc: Updated MAINTAINERS.yaml Change-Id: Ibda441858a22c9e8bb22e132c165e7724aaf7539 --- M MAINTAINERS.yaml 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/MAINTAINERS.yaml b/MAINTAINERS.yaml index 8a2bf75..068da7f 100644 --- a/MAINTAINERS.yaml +++ b/MAINTAINERS.yaml @@ -63,7 +63,10 @@ - Giacomo Travaglini arch-gcn3: - status: orphaned + status: maintained + maintainers: +- Matt Poremba +- Matt Sinclair arch-mips: status: orphaned @@ -90,6 +93,7 @@ status: maintained maintainers: - Bobby Bruce +- Daniel Carvalho base-stats: status: orphaned @@ -132,7 +136,9 @@ - Gabe Black dev-hsa: - status: orphaned + status: maintained + maintainers: +- Matt Poremba dev-virtio: status: maintained @@ -175,6 +181,7 @@ status: maintained maintainers: - Matt Poremba +- Matt Sinclair learning-gem5: desc: >- @@ -196,6 +203,7 @@ status: maintained maintainers: - Nikos Nikoleris +- Daniel Carvalho mem-dram: status: maintained @@ -215,6 +223,7 @@ status: maintained maintainers: - Jason Lowe-Power +- Matt Sinclair misc: desc: >- -- To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/37356 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: Ibda441858a22c9e8bb22e132c165e7724aaf7539 Gerrit-Change-Number: 37356 Gerrit-PatchSet: 1 Gerrit-Owner: Bobby R. Bruce Gerrit-MessageType: newchange ___ 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
[gem5-dev] Change in gem5/gem5[develop]: dev-arm,misc: Added missing override to scmi_platform functions
Bobby R. Bruce has uploaded this change for review. ( https://gem5-review.googlesource.com/c/public/gem5/+/37355 ) Change subject: dev-arm,misc: Added missing override to scmi_platform functions .. dev-arm,misc: Added missing override to scmi_platform functions The missing overrides on the "raiseInterrupt" and "clearInterrupt" resulted in compilation failures when using Clang. Change-Id: Ic77e8587cd622f8f0cb819c3230893a1b169a2a2 --- M src/dev/arm/css/scmi_platform.hh 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/dev/arm/css/scmi_platform.hh b/src/dev/arm/css/scmi_platform.hh index b46cfb0..567e548 100644 --- a/src/dev/arm/css/scmi_platform.hh +++ b/src/dev/arm/css/scmi_platform.hh @@ -292,8 +292,8 @@ Port& getPort(const std::string _name, PortID idx) override; -void raiseInterrupt(const Doorbell *doorbell); -void clearInterrupt(const Doorbell *doorbell); +void raiseInterrupt(const Doorbell *doorbell) override; +void clearInterrupt(const Doorbell *doorbell) override; static uint32_t protocolID(const Message ) -- To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/37355 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: Ic77e8587cd622f8f0cb819c3230893a1b169a2a2 Gerrit-Change-Number: 37355 Gerrit-PatchSet: 1 Gerrit-Owner: Bobby R. Bruce Gerrit-MessageType: newchange ___ 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
[gem5-dev] Change in gem5/gem5[hotfix-garnet-network-interface]: mem-garnet: Fix garnet network interface stats
Bobby R. Bruce has submitted this change. ( https://gem5-review.googlesource.com/c/public/gem5/+/37115 ) Change subject: mem-garnet: Fix garnet network interface stats .. mem-garnet: Fix garnet network interface stats Fixing a bug in garnet network interface where flit source delay is computed using both tick and cycle. Change-Id: If21a985f371a818611d13e9cd5ce344dbcf5fb2b Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/36416 Reviewed-by: Srikant Bharadwaj Maintainer: Matthew Poremba Tested-by: kokoro Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/37115 Maintainer: Bobby R. Bruce Reviewed-by: Daniel Carvalho Reviewed-by: Jieming Yin --- M src/mem/ruby/network/garnet/NetworkInterface.cc 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jieming Yin: Looks good to me, approved Srikant Bharadwaj: Looks good to me, approved Daniel Carvalho: Looks good to me, approved Bobby R. Bruce: Looks good to me, approved kokoro: Regressions pass diff --git a/src/mem/ruby/network/garnet/NetworkInterface.cc b/src/mem/ruby/network/garnet/NetworkInterface.cc index 6dbe0d9..bd5390f 100644 --- a/src/mem/ruby/network/garnet/NetworkInterface.cc +++ b/src/mem/ruby/network/garnet/NetworkInterface.cc @@ -435,7 +435,7 @@ net_msg_ptr->getMessageSize()), oPort->bitWidth(), curTick()); -fl->set_src_delay(curTick() - ticksToCycles(msg_ptr->getTime())); +fl->set_src_delay(curTick() - msg_ptr->getTime()); niOutVcs[vc].insert(fl); } -- To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/37115 To unsubscribe, or for help writing mail filters, visit https://gem5-review.googlesource.com/settings Gerrit-Project: public/gem5 Gerrit-Branch: hotfix-garnet-network-interface Gerrit-Change-Id: If21a985f371a818611d13e9cd5ce344dbcf5fb2b Gerrit-Change-Number: 37115 Gerrit-PatchSet: 2 Gerrit-Owner: Bobby R. Bruce Gerrit-Reviewer: Bobby R. Bruce Gerrit-Reviewer: Daniel Carvalho Gerrit-Reviewer: Jieming Yin Gerrit-Reviewer: Srikant Bharadwaj Gerrit-Reviewer: kokoro 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
[gem5-dev] Change in gem5/gem5[hotfix-garnet-network-interface]: misc: Updated the RELEASE-NOTES and version number
Bobby R. Bruce has submitted this change. ( https://gem5-review.googlesource.com/c/public/gem5/+/37116 ) Change subject: misc: Updated the RELEASE-NOTES and version number .. misc: Updated the RELEASE-NOTES and version number Updated the RELEASE-NOTES.md and version number for the v20.1.0.1 hot-fix. Change-Id: I51f7ba6f1178a2d8e80488ed2184b8735c2234a2 Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/37116 Maintainer: Bobby R. Bruce Reviewed-by: Daniel Carvalho Tested-by: kokoro --- M RELEASE-NOTES.md M src/Doxyfile M src/base/version.cc 3 files changed, 8 insertions(+), 2 deletions(-) Approvals: Daniel Carvalho: Looks good to me, approved Bobby R. Bruce: Looks good to me, approved kokoro: Regressions pass diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md index 492bb96..46c8795 100644 --- a/RELEASE-NOTES.md +++ b/RELEASE-NOTES.md @@ -1,3 +1,9 @@ +# Version 20.1.0.1 + +**[HOTFIX]** A patch was applied to fix the Garnet network interface stats. +Previously, the flit source delay was computed using both tick and cycles. +This bug affected the overall behavior of the Garnet Network Model. + # Version 20.1.0.0 Thank you to everyone that made this release possible! diff --git a/src/Doxyfile b/src/Doxyfile index d029a66..83770d5 100644 --- a/src/Doxyfile +++ b/src/Doxyfile @@ -31,7 +31,7 @@ # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = v20.1.0.0 +PROJECT_NUMBER = v20.1.0.1 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # base path where the generated documentation will be put. diff --git a/src/base/version.cc b/src/base/version.cc index 8edb8c6..3ad07fa 100644 --- a/src/base/version.cc +++ b/src/base/version.cc @@ -29,4 +29,4 @@ /** * @ingroup api_base_utils */ -const char *gem5Version = "20.1.0.0"; +const char *gem5Version = "20.1.0.1"; -- To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/37116 To unsubscribe, or for help writing mail filters, visit https://gem5-review.googlesource.com/settings Gerrit-Project: public/gem5 Gerrit-Branch: hotfix-garnet-network-interface Gerrit-Change-Id: I51f7ba6f1178a2d8e80488ed2184b8735c2234a2 Gerrit-Change-Number: 37116 Gerrit-PatchSet: 2 Gerrit-Owner: Bobby R. Bruce Gerrit-Reviewer: Bobby R. Bruce Gerrit-Reviewer: Daniel Carvalho Gerrit-Reviewer: kokoro 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
[gem5-dev] Change in gem5/gem5[develop]: mem,scons: Changed assert to panic_if in MessageBuffer
Bobby R. Bruce has submitted this change. ( https://gem5-review.googlesource.com/c/public/gem5/+/36697 ) Change subject: mem,scons: Changed assert to panic_if in MessageBuffer .. mem,scons: Changed assert to panic_if in MessageBuffer The variable 'm_allow_zero_latency' was only used in an assert message in `src/mem/ruby/network/MessageBuffer.cc`. This assert is stripped when compiling to gem5.fast, resulting in the compilation failing with an unused variable error. This assert is better as a panic_if, which will not be stripped out during the .fast compilation. Change-Id: I5de74982fa42b3291899ddcf73f7140079e1ec3f Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/36697 Maintainer: Bobby R. Bruce Tested-by: kokoro Reviewed-by: Jason Lowe-Power --- M src/mem/ruby/network/MessageBuffer.cc 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Jason Lowe-Power: Looks good to me, approved Bobby R. Bruce: Looks good to me, approved kokoro: Regressions pass diff --git a/src/mem/ruby/network/MessageBuffer.cc b/src/mem/ruby/network/MessageBuffer.cc index fad1fca..2eec110 100644 --- a/src/mem/ruby/network/MessageBuffer.cc +++ b/src/mem/ruby/network/MessageBuffer.cc @@ -173,7 +173,8 @@ // Calculate the arrival time of the message, that is, the first // cycle the message can be dequeued. -assert((delta > 0) || m_allow_zero_latency); +panic_if((delta == 0) && !m_allow_zero_latency, + "Delta equals zero and allow_zero_latency is false during enqueue"); Tick arrival_time = 0; // random delays are inserted if the RubySystem level randomization flag -- To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/36697 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: I5de74982fa42b3291899ddcf73f7140079e1ec3f Gerrit-Change-Number: 36697 Gerrit-PatchSet: 8 Gerrit-Owner: Bobby R. Bruce Gerrit-Reviewer: Andreas Sandberg Gerrit-Reviewer: Bobby R. Bruce Gerrit-Reviewer: Ciro Santilli Gerrit-Reviewer: Gabe Black Gerrit-Reviewer: Hoa Nguyen Gerrit-Reviewer: Jason Lowe-Power Gerrit-Reviewer: Tiago Mück Gerrit-Reviewer: kokoro Gerrit-CC: Gabe Black 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
[gem5-dev] Change in gem5/gem5[develop]: util: Updated the Dockerfiles for Python3
Bobby R. Bruce has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/36595 )
Change subject: util: Updated the Dockerfiles for Python3
..
util: Updated the Dockerfiles for Python3
For the next release of gem5, we are dropping support for Python2. The
Ubuntu 18.04 Docker images were running with Python2. This has been
updated.
It should be noted that there is, at present, no eligant solution to the
issue that older versions of Scons (such as that obtainable via APT in
Ubuntu 18.04) use Python2. Those wishing to compile with these Docker
Images should use
`/usr/bin/env python3 $(which scons) build/X86/gem5.op5`
Change-Id: Ic36ecc7196688daff21af2bb3a76381966f38f60
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/36595
Maintainer: Gabe Black
Tested-by: kokoro
Reviewed-by: Jason Lowe-Power
---
M util/dockerfiles/ubuntu-18.04_all-dependencies/Dockerfile
M util/dockerfiles/ubuntu-18.04_clang-version/Dockerfile
M util/dockerfiles/ubuntu-18.04_gcc-version/Dockerfile
M util/dockerfiles/ubuntu-18.04_min-dependencies/Dockerfile
4 files changed, 7 insertions(+), 6 deletions(-)
Approvals:
Jason Lowe-Power: Looks good to me, approved
Gabe Black: Looks good to me, approved
kokoro: Regressions pass
diff --git a/util/dockerfiles/ubuntu-18.04_all-dependencies/Dockerfile
b/util/dockerfiles/ubuntu-18.04_all-dependencies/Dockerfile
index 1259f2e..2403a50 100644
--- a/util/dockerfiles/ubuntu-18.04_all-dependencies/Dockerfile
+++ b/util/dockerfiles/ubuntu-18.04_all-dependencies/Dockerfile
@@ -30,5 +30,5 @@
RUN apt -y upgrade
RUN apt -y install build-essential git m4 scons zlib1g zlib1g-dev \
libprotobuf-dev protobuf-compiler libprotoc-dev
libgoogle-perftools-dev \
-python-dev python python-six doxygen libboost-all-dev
libhdf5-serial-dev \
-python-pydot libpng-dev libelf-dev pkg-config
+python3-dev python3 python3-six doxygen libboost-all-dev \
+libhdf5-serial-dev python3-pydot libpng-dev libelf-dev pkg-config
diff --git a/util/dockerfiles/ubuntu-18.04_clang-version/Dockerfile
b/util/dockerfiles/ubuntu-18.04_clang-version/Dockerfile
index 428bd02..97f3dbc 100644
--- a/util/dockerfiles/ubuntu-18.04_clang-version/Dockerfile
+++ b/util/dockerfiles/ubuntu-18.04_clang-version/Dockerfile
@@ -40,7 +40,7 @@
RUN apt -y upgrade
RUN apt -y install git m4 scons zlib1g zlib1g-dev clang-${version} \
libprotobuf-dev protobuf-compiler libprotoc-dev
libgoogle-perftools-dev \
-python-dev python python-six doxygen
+python3-dev python3 python3-six doxygen
RUN apt-get --purge -y remove gcc
diff --git a/util/dockerfiles/ubuntu-18.04_gcc-version/Dockerfile
b/util/dockerfiles/ubuntu-18.04_gcc-version/Dockerfile
index 902e4a0..9f3da37 100644
--- a/util/dockerfiles/ubuntu-18.04_gcc-version/Dockerfile
+++ b/util/dockerfiles/ubuntu-18.04_gcc-version/Dockerfile
@@ -37,7 +37,8 @@
RUN apt -y upgrade
RUN apt -y install git m4 scons zlib1g zlib1g-dev gcc-multilib \
libprotobuf-dev protobuf-compiler libprotoc-dev
libgoogle-perftools-dev \
-python-dev python python-six doxygen wget zip gcc-${version}
g++-${version}
+python3-dev python3 python3-six doxygen wget zip gcc-${version} \
+g++-${version}
RUN update-alternatives --install \
/usr/bin/g++ g++ /usr/bin/g++-${version} 100
diff --git a/util/dockerfiles/ubuntu-18.04_min-dependencies/Dockerfile
b/util/dockerfiles/ubuntu-18.04_min-dependencies/Dockerfile
index 986b2b6..5ec6784 100644
--- a/util/dockerfiles/ubuntu-18.04_min-dependencies/Dockerfile
+++ b/util/dockerfiles/ubuntu-18.04_min-dependencies/Dockerfile
@@ -28,5 +28,5 @@
RUN apt -y update
RUN apt -y upgrade
-RUN apt -y install build-essential scons zlib1g-dev m4 python-dev python \
-python-six
+RUN apt -y install build-essential scons zlib1g-dev m4 python3-dev python3
\
+python3-six
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/36595
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: Ic36ecc7196688daff21af2bb3a76381966f38f60
Gerrit-Change-Number: 36595
Gerrit-PatchSet: 5
Gerrit-Owner: Bobby R. Bruce
Gerrit-Reviewer: Bobby R. Bruce
Gerrit-Reviewer: Gabe Black
Gerrit-Reviewer: Gabe Black
Gerrit-Reviewer: Jason Lowe-Power
Gerrit-Reviewer: Jason Lowe-Power
Gerrit-Reviewer: Kyle Roarty
Gerrit-Reviewer: kokoro
Gerrit-CC: Ciro Santilli
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
[gem5-dev] Change in gem5/gem5[develop]: util,misc: Altered cpt_upgrader.py shebang to Python3
Bobby R. Bruce has submitted this change. ( https://gem5-review.googlesource.com/c/public/gem5/+/36715 ) Change subject: util,misc: Altered cpt_upgrader.py shebang to Python3 .. util,misc: Altered cpt_upgrader.py shebang to Python3 This script is necessisary for compilation yet is dependent on Python2. On a pure Python3 system, this results in a compilation failure. This script works fine with Python3. Change-Id: Ib1470a76d65455e727041686788c08f385e7251a Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/36715 Tested-by: kokoro Maintainer: Gabe Black Maintainer: Andreas Sandberg Reviewed-by: Hoa Nguyen Reviewed-by: Andreas Sandberg Reviewed-by: Jason Lowe-Power --- M util/cpt_upgrader.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jason Lowe-Power: Looks good to me, approved Andreas Sandberg: Looks good to me, approved; Looks good to me, approved Hoa Nguyen: Looks good to me, approved Gabe Black: Looks good to me, approved kokoro: Regressions pass diff --git a/util/cpt_upgrader.py b/util/cpt_upgrader.py index 96dcaf6..98875e3 100755 --- a/util/cpt_upgrader.py +++ b/util/cpt_upgrader.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Copyright (c) 2012-2013,2015-2016, 2020 ARM Limited # All rights reserved -- To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/36715 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: Ib1470a76d65455e727041686788c08f385e7251a Gerrit-Change-Number: 36715 Gerrit-PatchSet: 5 Gerrit-Owner: Bobby R. Bruce Gerrit-Reviewer: Andreas Sandberg Gerrit-Reviewer: Bobby R. Bruce Gerrit-Reviewer: Ciro Santilli Gerrit-Reviewer: Gabe Black Gerrit-Reviewer: Gabe Black Gerrit-Reviewer: Hoa Nguyen Gerrit-Reviewer: Jason Lowe-Power Gerrit-Reviewer: kokoro 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
[gem5-dev] Change in gem5/gem5[develop]: mem: Added missing override to cache_blk function
Bobby R. Bruce has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/36695 )
Change subject: mem: Added missing override to cache_blk function
..
mem: Added missing override to cache_blk function
This was causing a compilation warning/error when compiling with clang.
Change-Id: Ic6cf59c002656ba2ab05d8b58766613c289e7db0
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/36695
Reviewed-by: Nikos Nikoleris
Reviewed-by: Daniel Carvalho
Reviewed-by: Andreas Sandberg
Reviewed-by: Jason Lowe-Power
Maintainer: Nikos Nikoleris
Maintainer: Andreas Sandberg
Tested-by: kokoro
---
M src/mem/cache/cache_blk.hh
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Jason Lowe-Power: Looks good to me, approved
Andreas Sandberg: Looks good to me, approved; Looks good to me, approved
Nikos Nikoleris: Looks good to me, approved; Looks good to me, approved
Daniel Carvalho: Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/mem/cache/cache_blk.hh b/src/mem/cache/cache_blk.hh
index c16e599..bcd5c4b 100644
--- a/src/mem/cache/cache_blk.hh
+++ b/src/mem/cache/cache_blk.hh
@@ -160,7 +160,7 @@
/**
* Invalidate the block and clear all state.
*/
-virtual void invalidate()
+virtual void invalidate() override
{
TaggedEntry::invalidate();
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/36695
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: Ic6cf59c002656ba2ab05d8b58766613c289e7db0
Gerrit-Change-Number: 36695
Gerrit-PatchSet: 4
Gerrit-Owner: Bobby R. Bruce
Gerrit-Reviewer: Andreas Sandberg
Gerrit-Reviewer: Bobby R. Bruce
Gerrit-Reviewer: Daniel Carvalho
Gerrit-Reviewer: Jason Lowe-Power
Gerrit-Reviewer: Nikos Nikoleris
Gerrit-Reviewer: kokoro
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
[gem5-dev] Change in gem5/gem5[develop]: util: Updated compiler-test.sh for Python3
Bobby R. Bruce has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/36884 )
Change subject: util: Updated compiler-test.sh for Python3
..
util: Updated compiler-test.sh for Python3
In our Ubuntu 18.04 Docker Images, we require gem5 to be build using
`/usr/bin/env python3 /usr/bin/scons ...`.
Change-Id: I4dd3bca1602247575769e6c250337c3ee4a40780
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/36884
Tested-by: kokoro
Reviewed-by: Hoa Nguyen
Reviewed-by: Jason Lowe-Power
Maintainer: Jason Lowe-Power
---
M util/compiler-tests.sh
1 file changed, 2 insertions(+), 1 deletion(-)
Approvals:
Jason Lowe-Power: Looks good to me, approved; Looks good to me, approved
Hoa Nguyen: Looks good to me, approved
kokoro: Regressions pass
diff --git a/util/compiler-tests.sh b/util/compiler-tests.sh
index ccb2437..f8d4f5d 100755
--- a/util/compiler-tests.sh
+++ b/util/compiler-tests.sh
@@ -116,7 +116,8 @@
# Build with container
{
docker run --rm -v "${gem5_root}":"/gem5" -u $UID:$GID \
--w /gem5 $repo_name
scons "${build_out}" "${build_args}"
+-w /gem5 $repo_name /usr/bin/env python3
/usr/bin/scons \
+"${build_out}" "${build_args}"
}>"${build_stdout}" 2>"${build_stderr}"
result=$?
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/36884
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: I4dd3bca1602247575769e6c250337c3ee4a40780
Gerrit-Change-Number: 36884
Gerrit-PatchSet: 5
Gerrit-Owner: Bobby R. Bruce
Gerrit-Reviewer: Bobby R. Bruce
Gerrit-Reviewer: Gabe Black
Gerrit-Reviewer: Hoa Nguyen
Gerrit-Reviewer: Jason Lowe-Power
Gerrit-Reviewer: kokoro
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
[gem5-dev] Change in gem5/gem5[hotfix-garnet-network-interface]: misc: Updated the RELEASE-NOTES and version number
Bobby R. Bruce has uploaded this change for review. ( https://gem5-review.googlesource.com/c/public/gem5/+/37116 ) Change subject: misc: Updated the RELEASE-NOTES and version number .. misc: Updated the RELEASE-NOTES and version number Updated the RELEASE-NOTES.md and version number for the v20.1.0.1 hot-fix. Change-Id: I51f7ba6f1178a2d8e80488ed2184b8735c2234a2 --- M RELEASE-NOTES.md M src/Doxyfile M src/base/version.cc 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md index 492bb96..46c8795 100644 --- a/RELEASE-NOTES.md +++ b/RELEASE-NOTES.md @@ -1,3 +1,9 @@ +# Version 20.1.0.1 + +**[HOTFIX]** A patch was applied to fix the Garnet network interface stats. +Previously, the flit source delay was computed using both tick and cycles. +This bug affected the overall behavior of the Garnet Network Model. + # Version 20.1.0.0 Thank you to everyone that made this release possible! diff --git a/src/Doxyfile b/src/Doxyfile index d029a66..83770d5 100644 --- a/src/Doxyfile +++ b/src/Doxyfile @@ -31,7 +31,7 @@ # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = v20.1.0.0 +PROJECT_NUMBER = v20.1.0.1 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # base path where the generated documentation will be put. diff --git a/src/base/version.cc b/src/base/version.cc index 8edb8c6..3ad07fa 100644 --- a/src/base/version.cc +++ b/src/base/version.cc @@ -29,4 +29,4 @@ /** * @ingroup api_base_utils */ -const char *gem5Version = "20.1.0.0"; +const char *gem5Version = "20.1.0.1"; -- To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/37116 To unsubscribe, or for help writing mail filters, visit https://gem5-review.googlesource.com/settings Gerrit-Project: public/gem5 Gerrit-Branch: hotfix-garnet-network-interface Gerrit-Change-Id: I51f7ba6f1178a2d8e80488ed2184b8735c2234a2 Gerrit-Change-Number: 37116 Gerrit-PatchSet: 1 Gerrit-Owner: Bobby R. Bruce Gerrit-MessageType: newchange ___ 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
[gem5-dev] Change in gem5/gem5[hotfix-garnet-network-interface]: mem-garnet: Fix garnet network interface stats
Attention is currently required from: Jieming Yin, Srikant Bharadwaj. Hello kokoro, Jieming Yin, Srikant Bharadwaj, I'd like you to do a code review. Please visit https://gem5-review.googlesource.com/c/public/gem5/+/37115 to review the following change. Change subject: mem-garnet: Fix garnet network interface stats .. mem-garnet: Fix garnet network interface stats Fixing a bug in garnet network interface where flit source delay is computed using both tick and cycle. Change-Id: If21a985f371a818611d13e9cd5ce344dbcf5fb2b Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/36416 Reviewed-by: Srikant Bharadwaj Maintainer: Matthew Poremba Tested-by: kokoro --- M src/mem/ruby/network/garnet/NetworkInterface.cc 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mem/ruby/network/garnet/NetworkInterface.cc b/src/mem/ruby/network/garnet/NetworkInterface.cc index 6dbe0d9..bd5390f 100644 --- a/src/mem/ruby/network/garnet/NetworkInterface.cc +++ b/src/mem/ruby/network/garnet/NetworkInterface.cc @@ -435,7 +435,7 @@ net_msg_ptr->getMessageSize()), oPort->bitWidth(), curTick()); -fl->set_src_delay(curTick() - ticksToCycles(msg_ptr->getTime())); +fl->set_src_delay(curTick() - msg_ptr->getTime()); niOutVcs[vc].insert(fl); } -- To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/37115 To unsubscribe, or for help writing mail filters, visit https://gem5-review.googlesource.com/settings Gerrit-Project: public/gem5 Gerrit-Branch: hotfix-garnet-network-interface Gerrit-Change-Id: If21a985f371a818611d13e9cd5ce344dbcf5fb2b Gerrit-Change-Number: 37115 Gerrit-PatchSet: 1 Gerrit-Owner: Bobby R. Bruce Gerrit-Reviewer: Jieming Yin Gerrit-Reviewer: Srikant Bharadwaj Gerrit-Reviewer: kokoro Gerrit-Attention: Jieming Yin Gerrit-Attention: Srikant Bharadwaj Gerrit-MessageType: newchange ___ 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
[gem5-dev] Change in gem5/gem5[develop]: misc: Changed gem5 version info for gem5 20.2 dev
Bobby R. Bruce has submitted this change. ( https://gem5-review.googlesource.com/c/public/gem5/+/35439 ) Change subject: misc: Changed gem5 version info for gem5 20.2 dev .. misc: Changed gem5 version info for gem5 20.2 dev Change-Id: I34505c054f1ec83f5da169bfde90702f3da3917e Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/35439 Tested-by: kokoro Reviewed-by: Bobby R. Bruce Maintainer: Bobby R. Bruce --- M ext/testlib/configuration.py M src/Doxyfile M src/base/version.cc 3 files changed, 3 insertions(+), 3 deletions(-) Approvals: Bobby R. Bruce: Looks good to me, approved; Looks good to me, approved kokoro: Regressions pass diff --git a/ext/testlib/configuration.py b/ext/testlib/configuration.py index 3203479..1267c25 100644 --- a/ext/testlib/configuration.py +++ b/ext/testlib/configuration.py @@ -214,7 +214,7 @@ os.pardir, os.pardir)) defaults.result_path = os.path.join(os.getcwd(), 'testing-results') -defaults.resource_url = 'http://dist.gem5.org/dist/v20-1' +defaults.resource_url = 'http://dist.gem5.org/dist/develop' defaults.resource_path = os.path.abspath(os.path.join(defaults.base_dir, 'tests', 'gem5', diff --git a/src/Doxyfile b/src/Doxyfile index d029a66..d453314 100644 --- a/src/Doxyfile +++ b/src/Doxyfile @@ -31,7 +31,7 @@ # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = v20.1.0.0 +PROJECT_NUMBER = DEVELOP-FOR-V20.2 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # base path where the generated documentation will be put. diff --git a/src/base/version.cc b/src/base/version.cc index 8edb8c6..cfa98f9 100644 --- a/src/base/version.cc +++ b/src/base/version.cc @@ -29,4 +29,4 @@ /** * @ingroup api_base_utils */ -const char *gem5Version = "20.1.0.0"; +const char *gem5Version = "[DEVELOP-FOR-V20.2]"; -- To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/35439 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: I34505c054f1ec83f5da169bfde90702f3da3917e Gerrit-Change-Number: 35439 Gerrit-PatchSet: 3 Gerrit-Owner: Bobby R. Bruce Gerrit-Reviewer: Bobby R. Bruce Gerrit-Reviewer: kokoro 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
[gem5-dev] Change in gem5/gem5[develop]: misc: Changed gem5 version info for gem5 20.2 dev
Bobby R. Bruce has uploaded this change for review. ( https://gem5-review.googlesource.com/c/public/gem5/+/35439 ) Change subject: misc: Changed gem5 version info for gem5 20.2 dev .. misc: Changed gem5 version info for gem5 20.2 dev Change-Id: I34505c054f1ec83f5da169bfde90702f3da3917e --- M ext/testlib/configuration.py M src/Doxyfile M src/base/version.cc 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ext/testlib/configuration.py b/ext/testlib/configuration.py index 3203479..1267c25 100644 --- a/ext/testlib/configuration.py +++ b/ext/testlib/configuration.py @@ -214,7 +214,7 @@ os.pardir, os.pardir)) defaults.result_path = os.path.join(os.getcwd(), 'testing-results') -defaults.resource_url = 'http://dist.gem5.org/dist/v20-1' +defaults.resource_url = 'http://dist.gem5.org/dist/develop' defaults.resource_path = os.path.abspath(os.path.join(defaults.base_dir, 'tests', 'gem5', diff --git a/src/Doxyfile b/src/Doxyfile index d029a66..d453314 100644 --- a/src/Doxyfile +++ b/src/Doxyfile @@ -31,7 +31,7 @@ # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = v20.1.0.0 +PROJECT_NUMBER = DEVELOP-FOR-V20.2 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # base path where the generated documentation will be put. diff --git a/src/base/version.cc b/src/base/version.cc index 8edb8c6..cfa98f9 100644 --- a/src/base/version.cc +++ b/src/base/version.cc @@ -29,4 +29,4 @@ /** * @ingroup api_base_utils */ -const char *gem5Version = "20.1.0.0"; +const char *gem5Version = "[DEVELOP-FOR-V20.2]"; -- To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/35439 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: I34505c054f1ec83f5da169bfde90702f3da3917e Gerrit-Change-Number: 35439 Gerrit-PatchSet: 1 Gerrit-Owner: Bobby R. Bruce Gerrit-MessageType: newchange ___ 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
[gem5-dev] Change in gem5/gem5[develop]: misc: Readd -Werror for the gem5 20.2 development
Bobby R. Bruce has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/35495 )
Change subject: misc: Readd -Werror for the gem5 20.2 development
..
misc: Readd -Werror for the gem5 20.2 development
This reverts commit 2a4357bfd0c688a19cfd6b1c600bb2d2d6fa6151,
https://gem5-review.googlesource.com/c/public/gem5/+/35455
Change-Id: I10de506658bcad542abbb6d2b4f0c416d55bc121
---
M SConstruct
1 file changed, 6 insertions(+), 0 deletions(-)
diff --git a/SConstruct b/SConstruct
index ce9e9b6..8e7ec34 100755
--- a/SConstruct
+++ b/SConstruct
@@ -337,6 +337,12 @@
main.Append(PSHLINKFLAGS=shared_partial_flags)
main.Append(PLINKFLAGS=shared_partial_flags)
+# Treat warnings as errors but white list some warnings that we
+# want to allow (e.g., deprecation warnings).
+main.Append(CCFLAGS=['-Werror',
+ '-Wno-error=deprecated-declarations',
+ '-Wno-error=deprecated',
+])
else:
error('\n'.join((
"Don't know what compiler options to use for your compiler.",
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/35495
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: I10de506658bcad542abbb6d2b4f0c416d55bc121
Gerrit-Change-Number: 35495
Gerrit-PatchSet: 1
Gerrit-Owner: Bobby R. Bruce
Gerrit-MessageType: newchange
___
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
[gem5-dev] Change in gem5/gem5[release-staging-v20.1.0.0]: misc: Updated version to 20.1.0.0
Bobby R. Bruce has submitted this change. ( https://gem5-review.googlesource.com/c/public/gem5/+/35456 ) Change subject: misc: Updated version to 20.1.0.0 .. misc: Updated version to 20.1.0.0 Change-Id: Ic7a37581c58caa354eeecab051122116177d0721 Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/35456 Reviewed-by: Bobby R. Bruce Reviewed-by: Jason Lowe-Power Maintainer: Bobby R. Bruce Tested-by: kokoro --- M ext/testlib/configuration.py M src/Doxyfile M src/base/version.cc 3 files changed, 3 insertions(+), 3 deletions(-) Approvals: Jason Lowe-Power: Looks good to me, approved Bobby R. Bruce: Looks good to me, approved; Looks good to me, approved kokoro: Regressions pass diff --git a/ext/testlib/configuration.py b/ext/testlib/configuration.py index 1267c25..3203479 100644 --- a/ext/testlib/configuration.py +++ b/ext/testlib/configuration.py @@ -214,7 +214,7 @@ os.pardir, os.pardir)) defaults.result_path = os.path.join(os.getcwd(), 'testing-results') -defaults.resource_url = 'http://dist.gem5.org/dist/develop' +defaults.resource_url = 'http://dist.gem5.org/dist/v20-1' defaults.resource_path = os.path.abspath(os.path.join(defaults.base_dir, 'tests', 'gem5', diff --git a/src/Doxyfile b/src/Doxyfile index c92a787..d029a66 100644 --- a/src/Doxyfile +++ b/src/Doxyfile @@ -31,7 +31,7 @@ # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = DEVELOP-FOR-V20.1 +PROJECT_NUMBER = v20.1.0.0 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # base path where the generated documentation will be put. diff --git a/src/base/version.cc b/src/base/version.cc index ff58ad1..8edb8c6 100644 --- a/src/base/version.cc +++ b/src/base/version.cc @@ -29,4 +29,4 @@ /** * @ingroup api_base_utils */ -const char *gem5Version = "[DEVELOP-FOR-V20.1]"; +const char *gem5Version = "20.1.0.0"; -- To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/35456 To unsubscribe, or for help writing mail filters, visit https://gem5-review.googlesource.com/settings Gerrit-Project: public/gem5 Gerrit-Branch: release-staging-v20.1.0.0 Gerrit-Change-Id: Ic7a37581c58caa354eeecab051122116177d0721 Gerrit-Change-Number: 35456 Gerrit-PatchSet: 3 Gerrit-Owner: Bobby R. Bruce Gerrit-Reviewer: Bobby R. Bruce Gerrit-Reviewer: Jason Lowe-Power Gerrit-Reviewer: kokoro 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
[gem5-dev] Change in gem5/gem5[release-staging-v20.1.0.0]: scons: Removed -Werror for the gem5 20.1 release
Bobby R. Bruce has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/35455 )
Change subject: scons: Removed -Werror for the gem5 20.1 release
..
scons: Removed -Werror for the gem5 20.1 release
While gem5 compiles on all our supported compilers, removing the -Werror
flag on the stable branch ensures that, as new compilers are released
with stricter warnings, gem5 remains compilable.
Change-Id: I9a356472dc4d729a3fef9f1455814c900103bd66
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/35455
Maintainer: Bobby R. Bruce
Reviewed-by: Jason Lowe-Power
Reviewed-by: Gabe Black
Tested-by: kokoro
---
M SConstruct
1 file changed, 0 insertions(+), 6 deletions(-)
Approvals:
Jason Lowe-Power: Looks good to me, but someone else must approve
Gabe Black: Looks good to me, approved
Bobby R. Bruce: Looks good to me, approved
kokoro: Regressions pass
diff --git a/SConstruct b/SConstruct
index 621f923..0d8159b 100755
--- a/SConstruct
+++ b/SConstruct
@@ -337,12 +337,6 @@
main.Append(PSHLINKFLAGS=shared_partial_flags)
main.Append(PLINKFLAGS=shared_partial_flags)
-# Treat warnings as errors but white list some warnings that we
-# want to allow (e.g., deprecation warnings).
-main.Append(CCFLAGS=['-Werror',
- '-Wno-error=deprecated-declarations',
- '-Wno-error=deprecated',
-])
else:
error('\n'.join((
"Don't know what compiler options to use for your compiler.",
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/35455
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: release-staging-v20.1.0.0
Gerrit-Change-Id: I9a356472dc4d729a3fef9f1455814c900103bd66
Gerrit-Change-Number: 35455
Gerrit-PatchSet: 3
Gerrit-Owner: Bobby R. Bruce
Gerrit-Reviewer: Bobby R. Bruce
Gerrit-Reviewer: Gabe Black
Gerrit-Reviewer: Jason Lowe-Power
Gerrit-Reviewer: kokoro
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
[gem5-dev] Change in gem5/gem5[release-staging-v20.1.0.0]: misc: Updated CONTRIBUTING.md: 'master' -> 'stable'
branch by a gem5 maintainer. +4. The stable branch will be tagged with the new version number; the same as the last but with an incremented hotfix number (e.g., "v20.2.0.0" would transition to "v20.2.0.1"). 4. The hotfix branch will then be deleted. -- To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/35457 To unsubscribe, or for help writing mail filters, visit https://gem5-review.googlesource.com/settings Gerrit-Project: public/gem5 Gerrit-Branch: release-staging-v20.1.0.0 Gerrit-Change-Id: Ic5231eda336520e8a7260efac6474b4f0af08c37 Gerrit-Change-Number: 35457 Gerrit-PatchSet: 2 Gerrit-Owner: Bobby R. Bruce Gerrit-Reviewer: Bobby R. Bruce Gerrit-Reviewer: Jason Lowe-Power Gerrit-Reviewer: kokoro 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
[gem5-dev] Change in gem5/gem5[release-staging-v20.1.0.0]: ext: Disable range-loop-analysis warnings for pybind11
Bobby R. Bruce has submitted this change. ( https://gem5-review.googlesource.com/c/public/gem5/+/35296 ) Change subject: ext: Disable range-loop-analysis warnings for pybind11 .. ext: Disable range-loop-analysis warnings for pybind11 Change-Id: I9d9e118c1c70c2f6b11260fff31ecd763e491115 Signed-off-by: Nikos Nikoleris Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/35296 Reviewed-by: Bobby R. Bruce Maintainer: Bobby R. Bruce Tested-by: kokoro --- M ext/pybind11/include/pybind11/pybind11.h 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Bobby R. Bruce: Looks good to me, approved; Looks good to me, approved kokoro: Regressions pass diff --git a/ext/pybind11/include/pybind11/pybind11.h b/ext/pybind11/include/pybind11/pybind11.h index a9ee31a..04ef30f 100644 --- a/ext/pybind11/include/pybind11/pybind11.h +++ b/ext/pybind11/include/pybind11/pybind11.h @@ -12,6 +12,7 @@ #ifdef __clang__ #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wunused-value" +#pragma clang diagnostic warning "-Wrange-loop-analysis" #endif #if defined(__INTEL_COMPILER) -- To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/35296 To unsubscribe, or for help writing mail filters, visit https://gem5-review.googlesource.com/settings Gerrit-Project: public/gem5 Gerrit-Branch: release-staging-v20.1.0.0 Gerrit-Change-Id: I9d9e118c1c70c2f6b11260fff31ecd763e491115 Gerrit-Change-Number: 35296 Gerrit-PatchSet: 2 Gerrit-Owner: Nikos Nikoleris Gerrit-Reviewer: Andreas Sandberg Gerrit-Reviewer: Bobby R. Bruce Gerrit-Reviewer: Gabe Black Gerrit-Reviewer: Jason Lowe-Power Gerrit-Reviewer: kokoro 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
[gem5-dev] Change in gem5/gem5[release-staging-v20.1.0.0]: sim: Adding missing argument of panic function
Bobby R. Bruce has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/35040 )
Change subject: sim: Adding missing argument of panic function
..
sim: Adding missing argument of panic function
panic function call in panicFsOnlyPseudoInst (src/sim/pseudo_inst.cc) needs
to be invoked with argument (name).
Jira Issue:
https://gem5.atlassian.net/jira/software/c/projects/GEM5/issues/GEM5-786?filter=allissues
Change-Id: Iecacab7b9e0383373b69e9b790fa822d173d29c3
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/35040
Reviewed-by: Jason Lowe-Power
Maintainer: Jason Lowe-Power
Tested-by: kokoro
---
M src/sim/pseudo_inst.cc
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Jason Lowe-Power: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/sim/pseudo_inst.cc b/src/sim/pseudo_inst.cc
index 7335fda..6970120 100644
--- a/src/sim/pseudo_inst.cc
+++ b/src/sim/pseudo_inst.cc
@@ -103,7 +103,7 @@
static inline void
panicFsOnlyPseudoInst(const char *name)
{
-panic("Pseudo inst \"%s\" is only available in Full System mode.");
+panic("Pseudo inst \"%s\" is only available in Full System mode.",
name);
}
void
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/35040
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: release-staging-v20.1.0.0
Gerrit-Change-Id: Iecacab7b9e0383373b69e9b790fa822d173d29c3
Gerrit-Change-Number: 35040
Gerrit-PatchSet: 2
Gerrit-Owner: Sungkeun Kim
Gerrit-Reviewer: Bobby R. Bruce
Gerrit-Reviewer: Brandon Potter
Gerrit-Reviewer: Ciro Santilli
Gerrit-Reviewer: Jason Lowe-Power
Gerrit-Reviewer: kokoro
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
[gem5-dev] Change in gem5/gem5[release-staging-v20.1.0.0]: misc: Updated CONTRIBUTING.md: 'master' -> 'stable'
deleted. -- To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/35457 To unsubscribe, or for help writing mail filters, visit https://gem5-review.googlesource.com/settings Gerrit-Project: public/gem5 Gerrit-Branch: release-staging-v20.1.0.0 Gerrit-Change-Id: Ic5231eda336520e8a7260efac6474b4f0af08c37 Gerrit-Change-Number: 35457 Gerrit-PatchSet: 1 Gerrit-Owner: Bobby R. Bruce Gerrit-MessageType: newchange ___ 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
[gem5-dev] Change in gem5/gem5[release-staging-v20.1.0.0]: scons: Remove -Werror for the gem5 20.1 release
Bobby R. Bruce has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/35455 )
Change subject: scons: Remove -Werror for the gem5 20.1 release
..
scons: Remove -Werror for the gem5 20.1 release
While gem5 compiles on all our supported compilers, removing the -Werror
flag on the stable branch ensures that, as new compilers are released
with stricter warnings, gem5 remains compilable.
Change-Id: I9a356472dc4d729a3fef9f1455814c900103bd66
---
M SConstruct
1 file changed, 0 insertions(+), 6 deletions(-)
diff --git a/SConstruct b/SConstruct
index 621f923..0d8159b 100755
--- a/SConstruct
+++ b/SConstruct
@@ -337,12 +337,6 @@
main.Append(PSHLINKFLAGS=shared_partial_flags)
main.Append(PLINKFLAGS=shared_partial_flags)
-# Treat warnings as errors but white list some warnings that we
-# want to allow (e.g., deprecation warnings).
-main.Append(CCFLAGS=['-Werror',
- '-Wno-error=deprecated-declarations',
- '-Wno-error=deprecated',
-])
else:
error('\n'.join((
"Don't know what compiler options to use for your compiler.",
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/35455
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: release-staging-v20.1.0.0
Gerrit-Change-Id: I9a356472dc4d729a3fef9f1455814c900103bd66
Gerrit-Change-Number: 35455
Gerrit-PatchSet: 1
Gerrit-Owner: Bobby R. Bruce
Gerrit-MessageType: newchange
___
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
[gem5-dev] Change in gem5/gem5[release-staging-v20.1.0.0]: misc: Updated version to 20.1.0.0
Bobby R. Bruce has uploaded this change for review. ( https://gem5-review.googlesource.com/c/public/gem5/+/35456 ) Change subject: misc: Updated version to 20.1.0.0 .. misc: Updated version to 20.1.0.0 Change-Id: Ic7a37581c58caa354eeecab051122116177d0721 --- M ext/testlib/configuration.py M src/Doxyfile M src/base/version.cc 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ext/testlib/configuration.py b/ext/testlib/configuration.py index 1267c25..3203479 100644 --- a/ext/testlib/configuration.py +++ b/ext/testlib/configuration.py @@ -214,7 +214,7 @@ os.pardir, os.pardir)) defaults.result_path = os.path.join(os.getcwd(), 'testing-results') -defaults.resource_url = 'http://dist.gem5.org/dist/develop' +defaults.resource_url = 'http://dist.gem5.org/dist/v20-1' defaults.resource_path = os.path.abspath(os.path.join(defaults.base_dir, 'tests', 'gem5', diff --git a/src/Doxyfile b/src/Doxyfile index c92a787..d029a66 100644 --- a/src/Doxyfile +++ b/src/Doxyfile @@ -31,7 +31,7 @@ # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = DEVELOP-FOR-V20.1 +PROJECT_NUMBER = v20.1.0.0 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # base path where the generated documentation will be put. diff --git a/src/base/version.cc b/src/base/version.cc index ff58ad1..8edb8c6 100644 --- a/src/base/version.cc +++ b/src/base/version.cc @@ -29,4 +29,4 @@ /** * @ingroup api_base_utils */ -const char *gem5Version = "[DEVELOP-FOR-V20.1]"; +const char *gem5Version = "20.1.0.0"; -- To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/35456 To unsubscribe, or for help writing mail filters, visit https://gem5-review.googlesource.com/settings Gerrit-Project: public/gem5 Gerrit-Branch: release-staging-v20.1.0.0 Gerrit-Change-Id: Ic7a37581c58caa354eeecab051122116177d0721 Gerrit-Change-Number: 35456 Gerrit-PatchSet: 1 Gerrit-Owner: Bobby R. Bruce Gerrit-MessageType: newchange ___ 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
[gem5-dev] Change in gem5/gem5[release-staging-v20.1.0.0]: tests,misc: Updated TestLib and boot-tests for gzipped imgs
Bobby R. Bruce has submitted this change. ( https://gem5-review.googlesource.com/c/public/gem5/+/35257 ) Change subject: tests,misc: Updated TestLib and boot-tests for gzipped imgs .. tests,misc: Updated TestLib and boot-tests for gzipped imgs In efforts to reduce storage costs and download times, the images hosted by us have been gzipped. The TestLib framework has therefore been extended to decompress gzipped files after download. The x86-boot-tests are, at present, the only tests which use the gem5 images. These tests have been updated to download the gzipped image. Change-Id: I6b2dbe9472a604148834820db8ea70e91e94376f Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/35257 Reviewed-by: Jason Lowe-Power Maintainer: Jason Lowe-Power Tested-by: kokoro --- M tests/gem5/fixture.py M tests/gem5/x86-boot-tests/test_linux_boot.py 2 files changed, 20 insertions(+), 5 deletions(-) Approvals: Jason Lowe-Power: Looks good to me, approved; Looks good to me, approved kokoro: Regressions pass diff --git a/tests/gem5/fixture.py b/tests/gem5/fixture.py index bb911dd..e21cb88 100644 --- a/tests/gem5/fixture.py +++ b/tests/gem5/fixture.py @@ -42,6 +42,7 @@ import sys import socket import threading +import gzip from six.moves import urllib @@ -260,11 +261,11 @@ and downloads an updated version if it is needed. """ -def __new__(cls, url, path, filename): +def __new__(cls, url, path, filename, gzip_decompress=False): target = joinpath(path, filename) return super(DownloadedProgram, cls).__new__(cls, target) -def _init(self, url, path, filename, **kwargs): +def _init(self, url, path, filename, gzip_decompress=False, **kwargs): """ url: string The url of the archive @@ -272,12 +273,16 @@ The absolute path of the directory containing the archive filename: string The name of the archive +gzip_decompress: boolean +True if this target resource have been compressed using gzip and +is to be decompressed prior to usage. """ self.url = url self.path = path self.filename = joinpath(path, filename) self.name = "Downloaded:" + self.filename +self.gzip_decompress = gzip_decompress def _download(self): import errno @@ -288,7 +293,17 @@ except OSError as e: if e.errno != errno.EEXIST: raise -urllib.request.urlretrieve(self.url, self.filename) +if self.gzip_decompress: +gzipped_filename = self.filename + ".gz" +urllib.request.urlretrieve(self.url, gzipped_filename) + +with open(self.filename, 'w') as outfile: +with gzip.open(gzipped_filename, 'r') as infile: +shutil.copyfileobj(infile, outfile) + +os.remove(gzipped_filename) +else: +urllib.request.urlretrieve(self.url, self.filename) def _getremotetime(self): import datetime, time diff --git a/tests/gem5/x86-boot-tests/test_linux_boot.py b/tests/gem5/x86-boot-tests/test_linux_boot.py index 0e66659..d73f3a1 100644 --- a/tests/gem5/x86-boot-tests/test_linux_boot.py +++ b/tests/gem5/x86-boot-tests/test_linux_boot.py @@ -34,13 +34,13 @@ base_path = joinpath(absdirpath(__file__), '..', 'resources', 'ubuntu-boot') -image_url = config.resource_url + '/images/x86/ubuntu-18-04/base.img' +image_url = config.resource_url + '/images/x86/ubuntu-18-04/base.img.gz' kernel_url = config.resource_url + '/kernels/x86/static/vmlinux-4.19.83' image_name = 'ubuntu-18-04-base.img' kernel_name = 'vmlinux-4.19.83' # 4.19 is LTS (Projected EOL: Dec, 2020) -image = DownloadedProgram(image_url, base_path, image_name) +image = DownloadedProgram(image_url, base_path, image_name, True) kernel = DownloadedProgram(kernel_url, base_path, kernel_name) -- To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/35257 To unsubscribe, or for help writing mail filters, visit https://gem5-review.googlesource.com/settings Gerrit-Project: public/gem5 Gerrit-Branch: release-staging-v20.1.0.0 Gerrit-Change-Id: I6b2dbe9472a604148834820db8ea70e91e94376f Gerrit-Change-Number: 35257 Gerrit-PatchSet: 3 Gerrit-Owner: Bobby R. Bruce Gerrit-Reviewer: Bobby R. Bruce Gerrit-Reviewer: Gabe Black Gerrit-Reviewer: Giacomo Travaglini Gerrit-Reviewer: Hoa Nguyen Gerrit-Reviewer: Jason Lowe-Power Gerrit-Reviewer: kokoro 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
[gem5-dev] Change in gem5/gem5[release-staging-v20.1.0.0]: scons,python: Add python2-config to PYTHON_CONFIG
Bobby R. Bruce has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/35255 )
Change subject: scons,python: Add python2-config to PYTHON_CONFIG
..
scons,python: Add python2-config to PYTHON_CONFIG
PYTHON_CONFIG can be python2-config as well as python2.7-config.
Change-Id: I482cb922fcf26b37f67f2aca392e04968ca144bd
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/35255
Reviewed-by: Jason Lowe-Power
Reviewed-by: Andreas Sandberg
Maintainer: Jason Lowe-Power
Tested-by: kokoro
---
M SConstruct
1 file changed, 2 insertions(+), 1 deletion(-)
Approvals:
Jason Lowe-Power: Looks good to me, approved; Looks good to me, approved
Andreas Sandberg: Looks good to me, approved
kokoro: Regressions pass
diff --git a/SConstruct b/SConstruct
index 316c10b..667a0e6 100755
--- a/SConstruct
+++ b/SConstruct
@@ -238,7 +238,8 @@
('MARSHAL_CCFLAGS_EXTRA', 'Extra C and C++ marshal compiler
flags', ''),
('MARSHAL_LDFLAGS_EXTRA', 'Extra marshal linker flags', ''),
('PYTHON_CONFIG', 'Python config binary to use',
- [ 'python3-config', 'python-config', 'python2.7-config' ]),
+
[ 'python3-config', 'python-config', 'python2.7-config', 'python2-config']
+),
('PROTOC', 'protoc tool', environ.get('PROTOC', 'protoc')),
('BATCH', 'Use batch pool for build and tests', False),
('BATCH_CMD', 'Batch pool submission command name', 'qdo'),
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/35255
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: release-staging-v20.1.0.0
Gerrit-Change-Id: I482cb922fcf26b37f67f2aca392e04968ca144bd
Gerrit-Change-Number: 35255
Gerrit-PatchSet: 2
Gerrit-Owner: Bobby R. Bruce
Gerrit-Reviewer: Andreas Sandberg
Gerrit-Reviewer: Bobby R. Bruce
Gerrit-Reviewer: Jason Lowe-Power
Gerrit-Reviewer: kokoro
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
