[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]: 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]: 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]: 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]: 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 &annex, std::string
&output);
+bool getXferFeaturesRead(const std::string &annex,
+ std::string &output) 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]: 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]: 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 &p)
-: 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]: 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[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]: 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[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]: 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]: 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]: 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 &p)
-: 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]: 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 &annex, std::string
&output);
+bool getXferFeaturesRead(const std::string &annex,
+ std::string &output) 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: 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[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]: scons,python: Fix `--without-python` flag
Bobby R. Bruce has submitted this change. (
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
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/39715
Reviewed-by: Gabe Black
Reviewed-by: Lukas Steiner
Maintainer: Gabe Black
Tested-by: kokoro
---
M SConstruct
M src/SConscript
2 files changed, 32 insertions(+), 25 deletions(-)
Approvals:
Gabe Black: Looks good to me, approved; Looks good to me, approved
Lukas Steiner: Looks good to me, approved
kokoro: Regressions pass
diff --git a/SConstruct b/SConstruct
index 4cf2f10..f744c77 100755
--- a/SConstruct
+++ b/SConstruct
@@ -709,22 +709,25 @@
if not conf.CheckLib(lib):
error("Can't find library %s required by python." % lib)
-main.Prepend(CPPPATH=Dir('ext/pybind11/include/'))
-# Bare minimum environment that only includes python
-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")
+main.Prepend(CPPPATH=Dir('ext/pybind11/include/'))
-# 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.')
+marshal_env = main.Clone()
+
+# Bare minimum environment that only includes python
+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")
+
+# 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);'):
@@ -1271,10 +1274,13 @@
env.Append(CCFLAGS='$CCFLAGS_EXTRA')
env.Append(LINKFLAGS='$LDFLAGS_EXTRA')
+exports=['env']
+if main['USE_PYTHON']:
+exports.append('marshal_env')
+
# The src/SConscript file sets up the build rules in 'env' according
# to the configured variables. It returns a list of environments,
# one for each variant build (debug, opt, etc.)
-SConscript('src/SConscript', variant_dir=variant_path,
- exports=['env', 'marshal_env'])
+SConscript('src/SConscript', variant_dir=variant_path, exports=exports)
atexit.register(summarize_warnings)
diff --git a/src/SConscript b/src/SConscript
index 81a1b4d..74b9516 100644
--- a/src/SConscript
+++ b/src/SConscript
@@ -1208,11 +1208,6 @@
Transform("VER TAGS")))
env.AlwaysBuild(tags)
-# Build a small helper that marshals the Python code using the same
-# version of Python as gem5. This is in an unorthodox location to
-# avoid building it for every variant.
-py_marshal = marshal_env.Program('marshal', 'python/marshal.cc')[0]
-
# Embed python files. All .py files that have been indicated by a
# PySource() call in a SConscript need to be embedded into the M5
# library. To do that, we compile the file to byte code, marshal the
@@ -1266,10 +1261,16 @@
''')
code.write(str(target[0]))
-for source in PySource.all:
-marshal_env.Command(source.cpp, [ py_marshal, source.tnode ],
+if main['USE_PYTHON']:
+# Build a small helper that marshals the Python code using the same
+# version of Python as gem5. This is in an unorthodox location to
+# avoid building it for every variant.
+py_marshal = marshal_env.Program('marshal', 'python/marshal.cc')[0]
+
+for source in PySource.all:
+marshal_env.Command(source.cpp, [ py_marshal, source.tnode ],
MakeAction(embedPyFile, Transform("EMBED PY")))
-Source(source.cpp, tags=source.tags, add_tags='python')
+Source(source.cpp, tags=source.tags, add_tags='python')
#
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/39715
To unsubscribe, or for help
[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]: 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]: 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: 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]: 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]: 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]: 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]: 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]: 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]: 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", &Stats::ScalarInfo::value)
-.def("result", &Stats::ScalarInfo::result)
-.def("total", &Stats::ScalarInfo::total)
+.def_property_readonly("value", [](const Stats::ScalarInfo &info) {
+return info.value();
+})
+.def_property_readonly("result", [](const Stats::ScalarInfo &info)
{
+return info.result();
+})
+.def_property_readonly("total", [](const Stats::ScalarInfo &info) {
+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]: 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: 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 &info) {
+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]: 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", &Stats::ScalarInfo::total)
;
+py::class_>(
+m, "VectorInfo")
+.def_readwrite("subnames", &Stats::VectorInfo::subnames)
+.def_readwrite("subdescs", &Stats::VectorInfo::subdescs)
+.def_property_readonly("size", [](const Stats::VectorInfo &info) {
+return info.size();
+})
+.def_property_readonly("value", [](const Stats::VectorInfo &info) {
+return info.value();
+})
+.def_property_readonly("result", [](const Stats::VectorInfo &info)
{
+return info.result();
+})
+.def_property_readonly("total", [](const Stats::VectorInfo &info) {
+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 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", &Stats::ScalarInfo::total)
;
+py::class_>(
+m, "DistInfo")
+.def_property_readonly("min_val", [](const Stats::DistInfo &info) {
+return info.data.min_val;
+})
+.def_property_readonly("max_val", [](const Stats::DistInfo &info) {
+return info.data.max_val;
+})
+.def_property_readonly("bucket_size", [](const Stats::DistInfo
&info) {
+return info.data.bucket_size;
+})
+.def_property_readonly("values", [](const Stats::DistInfo &info) {
+return info.data.cvec;
+})
+.def_property_readonly("overflow", [](const Stats::DistInfo &info)
{
+return info.data.overflow;
+})
+.def_property_readonly("underflow", [](const Stats::DistInfo
&info) {
+return info.data.underflow;
+})
+.def_property_readonly("sum", [](const Stats::DistInfo &info) {
+return info.data.sum;
+})
+.def_property_readonly("logs", [](const Stats::DistInfo &info) {
+return info.data.logs;
+})
+.def_property_readonly("squares", [](const Stats::DistInfo &info) {
+return info.data.squares;
+})
+;
+
py::class_>(
m, "Group")
.def("regStats", &Stats::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: 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", &Stats::ScalarInfo::value)
-.def("result", &Stats::ScalarInfo::result)
-.def("total", &Stats::ScalarInfo::total)
+.def_property_readonly("value", [](const Stats::ScalarInfo &info) {
+return info.value();
+})
+.def_property_readonly("result", [](const Stats::ScalarInfo &info)
{
+return info.result();
+})
+.def_property_readonly("total", [](const Stats::ScalarInfo &info) {
+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 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", &Stats::Info::name)
+.def_property_readonly("unit", [](const Stats::Info &info) {
+return info.unit->getUnitString();
+})
.def_readonly("desc", &Stats::Info::desc)
.def_readonly("id", &Stats::Info::id)
.def_property_readonly("flags", [](const Stats::Info &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: 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[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[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[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[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]: 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 &cp) const;
-void unserialize(CheckpointIn &cp);
+void serialize(CheckpointOut &cp) const override;
+void unserialize(CheckpointIn &cp) override;
ISA(const Params &p);
};
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 &if_name, PortID idx=InvalidPortID);
+Port & getPort(const std::string &if_name,
+ PortID idx=InvalidPortID) override;
void serialize(CheckpointOut &cp) const override;
void unserialize(CheckpointIn &cp) 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 ¶ms);
-Port & getPort(const std::string &if_name, PortID idx=InvalidPortID);
+Port & getPort(const std::string &if_name,
+ PortID idx=InvalidPortID) override;
-void startup();
+void startup() override;
void serialize(CheckpointOut &cp) const override;
void unserialize(CheckpointIn &cp) 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 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 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 &cp) const;
-void unserialize(CheckpointIn &cp);
+void serialize(CheckpointOut &cp) const override;
+void unserialize(CheckpointIn &cp) override;
ISA(const Params &p);
};
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 &if_name, PortID idx=InvalidPortID);
+Port & getPort(const std::string &if_name,
+ PortID idx=InvalidPortID) override;
void serialize(CheckpointOut &cp) const override;
void unserialize(CheckpointIn &cp) 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 ¶ms);
-Port & getPort(const std::string &if_name, PortID idx=InvalidPortID);
+Port & getPort(const std::string &if_name,
+ PortID idx=InvalidPortID) override;
-void startup();
+void startup() override;
void serialize(CheckpointOut &cp) const override;
void unserialize(CheckpointIn &cp) 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]: 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]: 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]: 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,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", &Stats::Info::name)
+.def_property_readonly("unit", [](const Stats::Info &info) {
+return info.unit->getUnitString();
+})
.def_readonly("desc", &Stats::Info::desc)
.def_readonly("id", &Stats::Info::id)
.def_property_readonly("flags", [](const Stats::Info &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 Python Stats
Bobby R. Bruce has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/38615 )
Change subject: base-stats,python: Add Python Stats
..
base-stats,python: Add Python Stats
This model is used to store and represent the "new" hierarchical stats
at the Python level. Over time these classes may be extended with
functions to ease in the analysis of gem5 stats. Though, for this
commit, such functions have been kept to a minimum.
`m5/pystats/loader.py` contains functions for translating the gem5
`_m5.stats`
statistics exposed via Pybind11 to the Python Stats model. For example:
```
import m5.pystats.gem5stats as gem5stats
simstat = gem5stats.get_simstat(root)
```
All the python Stats model classes inherit from JsonSerializable meaning
they can be translated to JSON. For example:
```
import m5.pystats.gem5stats as gem5stats
simstat = gem5stats.get_simstat(root)
with open('test.json', 'w') as f:
simstat.dump(f)
```
The stats have also been exposed via the python statistics API. Via
command line, a JSON output may be specified with the argument
`--stats-file json://`.
Change-Id: I253a869f6b6d8c0de4dbed708892ee0cc33c5665
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/38615
Reviewed-by: Jason Lowe-Power
Reviewed-by: Andreas Sandberg
Maintainer: Jason Lowe-Power
Tested-by: kokoro
---
M src/python/SConscript
A src/python/m5/ext/pystats/__init__.py
A src/python/m5/ext/pystats/group.py
A src/python/m5/ext/pystats/jsonserializable.py
A src/python/m5/ext/pystats/simstat.py
A src/python/m5/ext/pystats/statistic.py
A src/python/m5/ext/pystats/storagetype.py
A src/python/m5/ext/pystats/timeconversion.py
M src/python/m5/stats/__init__.py
A src/python/m5/stats/gem5stats.py
10 files changed, 945 insertions(+), 4 deletions(-)
Approvals:
Jason Lowe-Power: Looks good to me, but someone else must approve; Looks
good to me, approved
Andreas Sandberg: Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/python/SConscript b/src/python/SConscript
index 19f260a..57d5578 100644
--- a/src/python/SConscript
+++ b/src/python/SConscript
@@ -64,6 +64,15 @@
PySource('m5.ext.pyfdt', 'm5/ext/pyfdt/pyfdt.py')
PySource('m5.ext.pyfdt', 'm5/ext/pyfdt/__init__.py')
+PySource('m5.ext.pystats', 'm5/ext/pystats/__init__.py')
+PySource('m5.ext.pystats', 'm5/ext/pystats/jsonserializable.py')
+PySource('m5.ext.pystats', 'm5/ext/pystats/group.py')
+PySource('m5.ext.pystats', 'm5/ext/pystats/simstat.py')
+PySource('m5.ext.pystats', 'm5/ext/pystats/statistic.py')
+PySource('m5.ext.pystats', 'm5/ext/pystats/storagetype.py')
+PySource('m5.ext.pystats', 'm5/ext/pystats/timeconversion.py')
+PySource('m5.stats', 'm5/stats/gem5stats.py')
+
Source('pybind11/core.cc', add_tags='python')
Source('pybind11/debug.cc', add_tags='python')
Source('pybind11/event.cc', add_tags='python')
diff --git a/src/python/m5/ext/pystats/__init__.py
b/src/python/m5/ext/pystats/__init__.py
new file mode 100644
index 000..4ffac9a
--- /dev/null
+++ b/src/python/m5/ext/pystats/__init__.py
@@ -0,0 +1,41 @@
+# Copyright (c) 2020 The Regents of The University of California
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met: redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer;
+# redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution;
+# neither the name of the copyright holders nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+from .jsonserializable import JsonSerializable
+from .group import Group
+from .simstat import SimStat
+from .statistic import Statistic
+from .storagetype import StorageType
+from .timeconversion import TimeConversion
+
+__all__ = [
+ "Group",
+ "Sim
[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 &p)
-: 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]: misc: Merge branch 'release-staging-v21-0' into develop
Bobby R. Bruce has uploaded this change for review. ( https://gem5-review.googlesource.com/c/public/gem5/+/42703 ) Change subject: misc: Merge branch 'release-staging-v21-0' into develop .. misc: Merge branch 'release-staging-v21-0' into develop Change-Id: Ie991a41620daeb3b98e6090497d62681d167da14 --- 1 file changed, 0 insertions(+), 0 deletions(-) -- To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/42703 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: Ie991a41620daeb3b98e6090497d62681d167da14 Gerrit-Change-Number: 42703 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-v21-0]: base-stats,python: Add missing "groups" in `_prepare_stats`
Bobby R. Bruce has uploaded this change for review. ( https://gem5-review.googlesource.com/c/public/gem5/+/42704 ) Change subject: base-stats,python: Add missing "groups" in `_prepare_stats` .. base-stats,python: Add missing "groups" in `_prepare_stats` Change-Id: Idb25185e1d29ac9fd8c0503d55b56e0568a61d1f --- M src/python/m5/stats/gem5stats.py 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/python/m5/stats/gem5stats.py b/src/python/m5/stats/gem5stats.py index 9446045..9a2259a 100644 --- a/src/python/m5/stats/gem5stats.py +++ b/src/python/m5/stats/gem5stats.py @@ -230,7 +230,7 @@ for stat in group.getStats(): stat.prepare() -for child in getStatGroups().values(): +for child in group.getStatGroups().values(): _prepare_stats(child) -- To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/42704 To unsubscribe, or for help writing mail filters, visit https://gem5-review.googlesource.com/settings Gerrit-Project: public/gem5 Gerrit-Branch: release-staging-v21-0 Gerrit-Change-Id: Idb25185e1d29ac9fd8c0503d55b56e0568a61d1f Gerrit-Change-Number: 42704 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-v21-0]: base-stats,python: Add missing "group" in `_prepare_stats`
Bobby R. Bruce has submitted this change. ( https://gem5-review.googlesource.com/c/public/gem5/+/42704 ) Change subject: base-stats,python: Add missing "group" in `_prepare_stats` .. base-stats,python: Add missing "group" in `_prepare_stats` Change-Id: Idb25185e1d29ac9fd8c0503d55b56e0568a61d1f Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/42704 Reviewed-by: Jason Lowe-Power Maintainer: Jason Lowe-Power Tested-by: kokoro --- M src/python/m5/stats/gem5stats.py 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/python/m5/stats/gem5stats.py b/src/python/m5/stats/gem5stats.py index 9446045..9a2259a 100644 --- a/src/python/m5/stats/gem5stats.py +++ b/src/python/m5/stats/gem5stats.py @@ -230,7 +230,7 @@ for stat in group.getStats(): stat.prepare() -for child in getStatGroups().values(): +for child in group.getStatGroups().values(): _prepare_stats(child) -- To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/42704 To unsubscribe, or for help writing mail filters, visit https://gem5-review.googlesource.com/settings Gerrit-Project: public/gem5 Gerrit-Branch: release-staging-v21-0 Gerrit-Change-Id: Idb25185e1d29ac9fd8c0503d55b56e0568a61d1f Gerrit-Change-Number: 42704 Gerrit-PatchSet: 3 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]: misc: Merge branch 'release-staging-v21-0' into develop
Bobby R. Bruce has submitted this change. ( https://gem5-review.googlesource.com/c/public/gem5/+/42703 ) Change subject: misc: Merge branch 'release-staging-v21-0' into develop .. misc: Merge branch 'release-staging-v21-0' into develop Change-Id: Ie991a41620daeb3b98e6090497d62681d167da14 --- 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Bobby R. Bruce: Looks good to me, approved; Looks good to me, approved kokoro: Regressions pass -- To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/42703 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: Ie991a41620daeb3b98e6090497d62681d167da14 Gerrit-Change-Number: 42703 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[hotfix-v20-1-0-5]: arch-arm: Fix atomics permission checks in TLB
Bobby R. Bruce has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/43143 )
Change subject: arch-arm: Fix atomics permission checks in TLB
..
arch-arm: Fix atomics permission checks in TLB
For stage 2 translations, atomic accesses were not checking the
access permission bits in the page table descriptors, and were
instead wrongly using the nature of the request itself
(r/w booleans).
Cherry-picked from:
https://gem5-review.googlesource.com/c/public/gem5/+/42073
Change-Id: I919a08b690287b03426d9124a61887e521f47823
---
M src/arch/arm/tlb.cc
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/arch/arm/tlb.cc b/src/arch/arm/tlb.cc
index 413a13e..a09c953 100644
--- a/src/arch/arm/tlb.cc
+++ b/src/arch/arm/tlb.cc
@@ -772,8 +772,7 @@
// sctlr.wxn overrides the xn bit
grant = !wxn && !xn;
} else if (is_atomic) {
-grant = r && w;
-grant_read = r;
+grant = hap;
} else if (is_write) {
grant = hap & 0x2;
} else { // is_read
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/43143
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: hotfix-v20-1-0-5
Gerrit-Change-Id: I919a08b690287b03426d9124a61887e521f47823
Gerrit-Change-Number: 43143
Gerrit-PatchSet: 1
Gerrit-Owner: Bobby R. Bruce
Gerrit-CC: Giacomo Travaglini
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-v20-1-0-5]: 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/+/43145 ) 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.5 hotfix release. Change-Id: I137a12325137799b9b1f98fe67ac55bfab49cd91 --- M RELEASE-NOTES.md M src/Doxyfile M src/base/version.cc 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md index 3f17091..d8b5f7a 100644 --- a/RELEASE-NOTES.md +++ b/RELEASE-NOTES.md @@ -1,3 +1,10 @@ +# Version 20.1.0.5 + +**[HOTFIX]** This hotfix release fixes two known bugs: + +* Atomic accesses were not checking the access permission bits in the page table descriptors. They were incorrectly using the nature of the request itself. This is now fixed. +* `num_l2chaches_per_cluster` and `num_cpus_per_cluster` were cast to floats in `configs/ruby/MESI_Three_Level_HTM.py`, which caused errors. This has been fixed so they are correctly cast to integers. + # 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). diff --git a/src/Doxyfile b/src/Doxyfile index 4ad0ea5..c9f1ed4 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.4 +PROJECT_NUMBER = v20.1.0.5 # 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 0a34488..3e7aa35 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.4"; +const char *gem5Version = "20.1.0.5"; -- To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/43145 To unsubscribe, or for help writing mail filters, visit https://gem5-review.googlesource.com/settings Gerrit-Project: public/gem5 Gerrit-Branch: hotfix-v20-1-0-5 Gerrit-Change-Id: I137a12325137799b9b1f98fe67ac55bfab49cd91 Gerrit-Change-Number: 43145 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-v20-1-0-5]: configs: Use integer division in MESI_Three_Level_HTM.py
Bobby R. Bruce has uploaded this change for review. ( https://gem5-review.googlesource.com/c/public/gem5/+/43144 ) Change subject: configs: Use integer division in MESI_Three_Level_HTM.py .. configs: Use integer division in MESI_Three_Level_HTM.py num_cpus_per_cluster and num_l2caches_per_cluster need to be integer as we are iterating over those variables Cherry-picked from: https://gem5-review.googlesource.com/c/public/gem5/+/42883 Change-Id: Ifc1f9cf06b36044289a0ba5e54666f1af2587fca --- M configs/ruby/MESI_Three_Level_HTM.py 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/ruby/MESI_Three_Level_HTM.py b/configs/ruby/MESI_Three_Level_HTM.py index 89ca93c..b6b1c7f 100644 --- a/configs/ruby/MESI_Three_Level_HTM.py +++ b/configs/ruby/MESI_Three_Level_HTM.py @@ -78,10 +78,10 @@ dma_cntrl_nodes = [] assert (options.num_cpus % options.num_clusters == 0) -num_cpus_per_cluster = options.num_cpus / options.num_clusters +num_cpus_per_cluster = options.num_cpus // options.num_clusters assert (options.num_l2caches % options.num_clusters == 0) -num_l2caches_per_cluster = options.num_l2caches / options.num_clusters +num_l2caches_per_cluster = options.num_l2caches // options.num_clusters l2_bits = int(math.log(num_l2caches_per_cluster, 2)) block_size_bits = int(math.log(options.cacheline_size, 2)) -- To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/43144 To unsubscribe, or for help writing mail filters, visit https://gem5-review.googlesource.com/settings Gerrit-Project: public/gem5 Gerrit-Branch: hotfix-v20-1-0-5 Gerrit-Change-Id: Ifc1f9cf06b36044289a0ba5e54666f1af2587fca Gerrit-Change-Number: 43144 Gerrit-PatchSet: 1 Gerrit-Owner: Bobby R. Bruce Gerrit-CC: Giacomo Travaglini 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-v20-1-0-5]: python: Fix incorrect prefixes is m5.utils.convert
Bobby R. Bruce has uploaded this change for review. ( https://gem5-review.googlesource.com/c/public/gem5/+/43146 ) Change subject: python: Fix incorrect prefixes is m5.utils.convert .. python: Fix incorrect prefixes is m5.utils.convert The conversion functions incorrectly assumed that kibibytes are 'kiB' rather than 'KiB' (correct). Cherry-picked from: https://gem5-review.googlesource.com/c/public/gem5/+/39375 Change-Id: Ia9409218c37284514fc4fabdabf327641db8cefc --- M src/python/m5/util/convert.py 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/python/m5/util/convert.py b/src/python/m5/util/convert.py index 077b6b4..ae667b3 100644 --- a/src/python/m5/util/convert.py +++ b/src/python/m5/util/convert.py @@ -62,7 +62,7 @@ 'Gi': gibi, 'G': giga, 'M': mega, -'ki': kibi, +'Ki': kibi, 'k': kilo, 'Mi': mebi, 'm': milli, @@ -84,7 +84,7 @@ 'G' : gibi, 'Mi': mebi, 'M' : mebi, -'ki': kibi, +'Ki': kibi, 'k' : kibi, } -- To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/43146 To unsubscribe, or for help writing mail filters, visit https://gem5-review.googlesource.com/settings Gerrit-Project: public/gem5 Gerrit-Branch: hotfix-v20-1-0-5 Gerrit-Change-Id: Ia9409218c37284514fc4fabdabf327641db8cefc Gerrit-Change-Number: 43146 Gerrit-PatchSet: 1 Gerrit-Owner: Bobby R. Bruce Gerrit-CC: Andreas Sandberg 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-v20-1-0-5]: arch-arm: Fix atomics permission checks in TLB
Bobby R. Bruce has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/43143 )
Change subject: arch-arm: Fix atomics permission checks in TLB
..
arch-arm: Fix atomics permission checks in TLB
For stage 2 translations, atomic accesses were not checking the
access permission bits in the page table descriptors, and were
instead wrongly using the nature of the request itself
(r/w booleans).
Cherry-picked from:
https://gem5-review.googlesource.com/c/public/gem5/+/42073
Change-Id: I919a08b690287b03426d9124a61887e521f47823
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/43143
Reviewed-by: Jason Lowe-Power
Maintainer: Jason Lowe-Power
Tested-by: kokoro
---
M src/arch/arm/tlb.cc
1 file changed, 1 insertion(+), 2 deletions(-)
Approvals:
Jason Lowe-Power: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/arch/arm/tlb.cc b/src/arch/arm/tlb.cc
index 413a13e..a09c953 100644
--- a/src/arch/arm/tlb.cc
+++ b/src/arch/arm/tlb.cc
@@ -772,8 +772,7 @@
// sctlr.wxn overrides the xn bit
grant = !wxn && !xn;
} else if (is_atomic) {
-grant = r && w;
-grant_read = r;
+grant = hap;
} else if (is_write) {
grant = hap & 0x2;
} else { // is_read
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/43143
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: hotfix-v20-1-0-5
Gerrit-Change-Id: I919a08b690287b03426d9124a61887e521f47823
Gerrit-Change-Number: 43143
Gerrit-PatchSet: 3
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[hotfix-v20-1-0-5]: python: Fix incorrect prefixes is m5.utils.convert
Bobby R. Bruce has submitted this change. ( https://gem5-review.googlesource.com/c/public/gem5/+/43146 ) Change subject: python: Fix incorrect prefixes is m5.utils.convert .. python: Fix incorrect prefixes is m5.utils.convert The conversion functions incorrectly assumed that kibibytes are 'kiB' rather than 'KiB' (correct). Cherry-picked from: https://gem5-review.googlesource.com/c/public/gem5/+/39375 Change-Id: Ia9409218c37284514fc4fabdabf327641db8cefc Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/43146 Reviewed-by: Jason Lowe-Power Reviewed-by: Andreas Sandberg Maintainer: Jason Lowe-Power Tested-by: kokoro --- M src/python/m5/util/convert.py 1 file changed, 2 insertions(+), 2 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/src/python/m5/util/convert.py b/src/python/m5/util/convert.py index 077b6b4..ae667b3 100644 --- a/src/python/m5/util/convert.py +++ b/src/python/m5/util/convert.py @@ -62,7 +62,7 @@ 'Gi': gibi, 'G': giga, 'M': mega, -'ki': kibi, +'Ki': kibi, 'k': kilo, 'Mi': mebi, 'm': milli, @@ -84,7 +84,7 @@ 'G' : gibi, 'Mi': mebi, 'M' : mebi, -'ki': kibi, +'Ki': kibi, 'k' : kibi, } -- To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/43146 To unsubscribe, or for help writing mail filters, visit https://gem5-review.googlesource.com/settings Gerrit-Project: public/gem5 Gerrit-Branch: hotfix-v20-1-0-5 Gerrit-Change-Id: Ia9409218c37284514fc4fabdabf327641db8cefc Gerrit-Change-Number: 43146 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[hotfix-v20-1-0-5]: configs: Use integer division in MESI_Three_Level_HTM.py
Bobby R. Bruce has submitted this change. ( https://gem5-review.googlesource.com/c/public/gem5/+/43144 ) Change subject: configs: Use integer division in MESI_Three_Level_HTM.py .. configs: Use integer division in MESI_Three_Level_HTM.py num_cpus_per_cluster and num_l2caches_per_cluster need to be integer as we are iterating over those variables Cherry-picked from: https://gem5-review.googlesource.com/c/public/gem5/+/42883 Change-Id: Ifc1f9cf06b36044289a0ba5e54666f1af2587fca Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/43144 Reviewed-by: Matt Sinclair Maintainer: Matt Sinclair Tested-by: kokoro --- M configs/ruby/MESI_Three_Level_HTM.py 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Matt Sinclair: Looks good to me, approved; Looks good to me, approved kokoro: Regressions pass diff --git a/configs/ruby/MESI_Three_Level_HTM.py b/configs/ruby/MESI_Three_Level_HTM.py index 89ca93c..b6b1c7f 100644 --- a/configs/ruby/MESI_Three_Level_HTM.py +++ b/configs/ruby/MESI_Three_Level_HTM.py @@ -78,10 +78,10 @@ dma_cntrl_nodes = [] assert (options.num_cpus % options.num_clusters == 0) -num_cpus_per_cluster = options.num_cpus / options.num_clusters +num_cpus_per_cluster = options.num_cpus // options.num_clusters assert (options.num_l2caches % options.num_clusters == 0) -num_l2caches_per_cluster = options.num_l2caches / options.num_clusters +num_l2caches_per_cluster = options.num_l2caches // options.num_clusters l2_bits = int(math.log(num_l2caches_per_cluster, 2)) block_size_bits = int(math.log(options.cacheline_size, 2)) -- To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/43144 To unsubscribe, or for help writing mail filters, visit https://gem5-review.googlesource.com/settings Gerrit-Project: public/gem5 Gerrit-Branch: hotfix-v20-1-0-5 Gerrit-Change-Id: Ifc1f9cf06b36044289a0ba5e54666f1af2587fca Gerrit-Change-Number: 43144 Gerrit-PatchSet: 3 Gerrit-Owner: Bobby R. Bruce Gerrit-Reviewer: Bobby R. Bruce Gerrit-Reviewer: Jason Lowe-Power Gerrit-Reviewer: Matt Sinclair Gerrit-Reviewer: kokoro Gerrit-CC: Giacomo Travaglini 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-v20-1-0-5]: misc: Updated the RELEASE-NOTES and version number
Bobby R. Bruce has submitted this change. ( https://gem5-review.googlesource.com/c/public/gem5/+/43145 ) 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.5 hotfix release. Change-Id: I137a12325137799b9b1f98fe67ac55bfab49cd91 Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/43145 Reviewed-by: Jason Lowe-Power Maintainer: Jason Lowe-Power Tested-by: kokoro --- M RELEASE-NOTES.md M src/Doxyfile M src/base/version.cc 3 files 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/RELEASE-NOTES.md b/RELEASE-NOTES.md index 3f17091..7c3472e 100644 --- a/RELEASE-NOTES.md +++ b/RELEASE-NOTES.md @@ -1,3 +1,11 @@ +# Version 20.1.0.5 + +**[HOTFIX]** This hotfix release fixes three known bugs: + +* `src/python/m5/util/convert.py` incorrectly stated kibibytes as 'kiB' instead of 'KiB'. This has been fixed. +* Atomic accesses were not checking the access permission bits in the page table descriptors. They were incorrectly using the nature of the request itself. This is now fixed. +* `num_l2chaches_per_cluster` and `num_cpus_per_cluster` were cast to floats in `configs/ruby/MESI_Three_Level_HTM.py`, which caused errors. This has been fixed so they are correctly cast to integers. + # 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). diff --git a/src/Doxyfile b/src/Doxyfile index 4ad0ea5..c9f1ed4 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.4 +PROJECT_NUMBER = v20.1.0.5 # 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 0a34488..3e7aa35 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.4"; +const char *gem5Version = "20.1.0.5"; -- To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/43145 To unsubscribe, or for help writing mail filters, visit https://gem5-review.googlesource.com/settings Gerrit-Project: public/gem5 Gerrit-Branch: hotfix-v20-1-0-5 Gerrit-Change-Id: I137a12325137799b9b1f98fe67ac55bfab49cd91 Gerrit-Change-Number: 43145 Gerrit-PatchSet: 3 Gerrit-Owner: Bobby R. Bruce Gerrit-Reviewer: Bobby R. Bruce Gerrit-Reviewer: Jason Lowe-Power Gerrit-Reviewer: Jason Lowe-Power Gerrit-Reviewer: kokoro Gerrit-CC: Giacomo Travaglini 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-v21-0]: misc: Merge branch v20.1.0.5 hotfix into release-staging-v21-0
Bobby R. Bruce has uploaded this change for review. ( https://gem5-review.googlesource.com/c/public/gem5/+/43203 ) Change subject: misc: Merge branch v20.1.0.5 hotfix into release-staging-v21-0 .. misc: Merge branch v20.1.0.5 hotfix into release-staging-v21-0 Change-Id: I7383ae1c9870b2f4929601305158030ec3423302 --- M SConstruct M src/Doxyfile M src/base/version.cc 4 files changed, 0 insertions(+), 12 deletions(-) diff --git a/SConstruct b/SConstruct index 2dbe8e3..fb3421c 100755 --- a/SConstruct +++ b/SConstruct @@ -133,14 +133,10 @@ # -<<< HEAD (68d612 base-stats: Fix Watt Unit) main = Environment(tools=['default', 'git', TempFileSpawn]) main.Tool(SCons.Tool.FindTool(['gcc', 'clang'], main)) main.Tool(SCons.Tool.FindTool(['g++', 'clang++'], main)) -=== -main = Environment(tools=['default', 'git']) ->>> BRANCH (31cd81 misc: Updated the RELEASE-NOTES and version number) from gem5_scons.util import get_termcap termcap = get_termcap() diff --git a/src/Doxyfile b/src/Doxyfile index 99dd40b..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 (68d612 base-stats: Fix Watt Unit) PROJECT_NUMBER = DEVELOP-FOR-V20.2 -=== -PROJECT_NUMBER = v20.1.0.5 ->>> BRANCH (31cd81 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 247b783..cfa98f9 100644 --- a/src/base/version.cc +++ b/src/base/version.cc @@ -29,8 +29,4 @@ /** * @ingroup api_base_utils */ -<<< HEAD (68d612 base-stats: Fix Watt Unit) const char *gem5Version = "[DEVELOP-FOR-V20.2]"; -=== -const char *gem5Version = "20.1.0.5"; ->>> BRANCH (31cd81 misc: Updated the RELEASE-NOTES and version number) -- To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/43203 To unsubscribe, or for help writing mail filters, visit https://gem5-review.googlesource.com/settings Gerrit-Project: public/gem5 Gerrit-Branch: release-staging-v21-0 Gerrit-Change-Id: I7383ae1c9870b2f4929601305158030ec3423302 Gerrit-Change-Number: 43203 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-v21-0]: misc: Merge branch v20.1.0.5 hotfix into release-staging-v21-0
Bobby R. Bruce has submitted this change. ( https://gem5-review.googlesource.com/c/public/gem5/+/43203 ) Change subject: misc: Merge branch v20.1.0.5 hotfix into release-staging-v21-0 .. misc: Merge branch v20.1.0.5 hotfix into release-staging-v21-0 Change-Id: I7383ae1c9870b2f4929601305158030ec3423302 --- M SConstruct M src/Doxyfile M src/base/version.cc 4 files changed, 0 insertions(+), 12 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 2dbe8e3..fb3421c 100755 --- a/SConstruct +++ b/SConstruct @@ -133,14 +133,10 @@ # -<<< HEAD (68d612 base-stats: Fix Watt Unit) main = Environment(tools=['default', 'git', TempFileSpawn]) main.Tool(SCons.Tool.FindTool(['gcc', 'clang'], main)) main.Tool(SCons.Tool.FindTool(['g++', 'clang++'], main)) -=== -main = Environment(tools=['default', 'git']) ->>> BRANCH (31cd81 misc: Updated the RELEASE-NOTES and version number) from gem5_scons.util import get_termcap termcap = get_termcap() diff --git a/src/Doxyfile b/src/Doxyfile index 99dd40b..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 (68d612 base-stats: Fix Watt Unit) PROJECT_NUMBER = DEVELOP-FOR-V20.2 -=== -PROJECT_NUMBER = v20.1.0.5 ->>> BRANCH (31cd81 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 247b783..cfa98f9 100644 --- a/src/base/version.cc +++ b/src/base/version.cc @@ -29,8 +29,4 @@ /** * @ingroup api_base_utils */ -<<< HEAD (68d612 base-stats: Fix Watt Unit) const char *gem5Version = "[DEVELOP-FOR-V20.2]"; -=== -const char *gem5Version = "20.1.0.5"; ->>> BRANCH (31cd81 misc: Updated the RELEASE-NOTES and version number) -- To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/43203 To unsubscribe, or for help writing mail filters, visit https://gem5-review.googlesource.com/settings Gerrit-Project: public/gem5 Gerrit-Branch: release-staging-v21-0 Gerrit-Change-Id: I7383ae1c9870b2f4929601305158030ec3423302 Gerrit-Change-Number: 43203 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: Merge branch 'release-staging-v21-0' into develop
Bobby R. Bruce has uploaded this change for review. ( https://gem5-review.googlesource.com/c/public/gem5/+/43265 ) Change subject: misc: Merge branch 'release-staging-v21-0' into develop .. misc: Merge branch 'release-staging-v21-0' into develop Change-Id: I0ad043ded56fb848e045057a1e7a56ea39797906 --- 1 file changed, 0 insertions(+), 0 deletions(-) -- To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/43265 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: I0ad043ded56fb848e045057a1e7a56ea39797906 Gerrit-Change-Number: 43265 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 'release-staging-v21-0' into develop
Bobby R. Bruce has submitted this change. ( https://gem5-review.googlesource.com/c/public/gem5/+/43265 ) Change subject: misc: Merge branch 'release-staging-v21-0' into develop .. misc: Merge branch 'release-staging-v21-0' into develop Change-Id: I0ad043ded56fb848e045057a1e7a56ea39797906 --- 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Bobby R. Bruce: Looks good to me, approved; Looks good to me, approved kokoro: Regressions pass -- To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/43265 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: I0ad043ded56fb848e045057a1e7a56ea39797906 Gerrit-Change-Number: 43265 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[release-staging-v21-0]: misc: Update version number to v21.0.0.0
Bobby R. Bruce has uploaded this change for review. ( https://gem5-review.googlesource.com/c/public/gem5/+/43405 ) Change subject: misc: Update version number to v21.0.0.0 .. misc: Update version number to v21.0.0.0 Change-Id: Ica7f7bfdcb1655e38defdf0b32a630e90adb7ce8 --- M src/Doxyfile M src/base/version.cc 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Doxyfile b/src/Doxyfile index d453314..b83a8b1 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.2 +PROJECT_NUMBER = v21.0.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 cfa98f9..b46ca39 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.2]"; +const char *gem5Version = "21.0.0.0"; -- To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/43405 To unsubscribe, or for help writing mail filters, visit https://gem5-review.googlesource.com/settings Gerrit-Project: public/gem5 Gerrit-Branch: release-staging-v21-0 Gerrit-Change-Id: Ica7f7bfdcb1655e38defdf0b32a630e90adb7ce8 Gerrit-Change-Number: 43405 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-v21-0]: scons: Remove -Werror for the gem5 21.0 release
Bobby R. Bruce has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/43425 )
Change subject: scons: Remove -Werror for the gem5 21.0 release
..
scons: Remove -Werror for the gem5 21.0 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: Ic7bb17e770684211330c09143bd8a26720becb9a
---
M SConstruct
1 file changed, 0 insertions(+), 6 deletions(-)
diff --git a/SConstruct b/SConstruct
index fb3421c..bcfd58f 100755
--- a/SConstruct
+++ b/SConstruct
@@ -322,12 +322,6 @@
if GetOption('gold_linker'):
main.Append(LINKFLAGS='-fuse-ld=gold')
-# 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/+/43425
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: release-staging-v21-0
Gerrit-Change-Id: Ic7bb17e770684211330c09143bd8a26720becb9a
Gerrit-Change-Number: 43425
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-v21-0]: tests: Remove references to resolved Jira Issues in asmtests
Bobby R. Bruce has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/43445 )
Change subject: tests: Remove references to resolved Jira Issues in asmtests
..
tests: Remove references to resolved Jira Issues in asmtests
A comment in tests/gem5/asmtest/tests.py refers to failing tests due
to issues outlined in https://gem5.atlassian.net/browse/GEM5-494 and
https://gem5.atlassian.net/browse/GEM5-497. Though, theses tests now
pass, and these issues have been resolved. This patch updates this
comment to no longer refer to these Jira issues.
Change-Id: Ic1b477e1570765f33a41c5e852bf80a09c172545
---
M tests/gem5/asmtest/tests.py
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/tests/gem5/asmtest/tests.py b/tests/gem5/asmtest/tests.py
index f267b91..6f2c711 100755
--- a/tests/gem5/asmtest/tests.py
+++ b/tests/gem5/asmtest/tests.py
@@ -90,11 +90,8 @@
cpu_types =
('AtomicSimpleCPU', 'TimingSimpleCPU', 'MinorCPU', 'DerivO3CPU')
# The following lists the RISCV binaries. Those commented out presently
result
-# in a test failure. They are outlined in the following Jira Issues:
-#
-# https://gem5.atlassian.net/browse/GEM5-494
+# in a test failure. This is outlined in the following Jira issue:
# https://gem5.atlassian.net/browse/GEM5-496
-# https://gem5.atlassian.net/browse/GEM5-497
binaries = (
'rv64samt-ps-sysclone_d',
'rv64samt-ps-sysfutex1_d',
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/43445
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: release-staging-v21-0
Gerrit-Change-Id: Ic1b477e1570765f33a41c5e852bf80a09c172545
Gerrit-Change-Number: 43445
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-v21-0]: tests: Remove references to resolved Jira Issues in asmtests
Bobby R. Bruce has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/43445 )
Change subject: tests: Remove references to resolved Jira Issues in asmtests
..
tests: Remove references to resolved Jira Issues in asmtests
A comment in tests/gem5/asmtest/tests.py refers to failing tests due
to issues outlined in https://gem5.atlassian.net/browse/GEM5-494 and
https://gem5.atlassian.net/browse/GEM5-497. Though, theses tests now
pass, and these issues have been resolved. This patch updates this
comment to no longer refer to these Jira issues.
Change-Id: Ic1b477e1570765f33a41c5e852bf80a09c172545
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/43445
Reviewed-by: Bobby R. Bruce
Maintainer: Bobby R. Bruce
Tested-by: kokoro
---
M tests/gem5/asmtest/tests.py
1 file changed, 1 insertion(+), 4 deletions(-)
Approvals:
Bobby R. Bruce: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/tests/gem5/asmtest/tests.py b/tests/gem5/asmtest/tests.py
index f267b91..6f2c711 100755
--- a/tests/gem5/asmtest/tests.py
+++ b/tests/gem5/asmtest/tests.py
@@ -90,11 +90,8 @@
cpu_types =
('AtomicSimpleCPU', 'TimingSimpleCPU', 'MinorCPU', 'DerivO3CPU')
# The following lists the RISCV binaries. Those commented out presently
result
-# in a test failure. They are outlined in the following Jira Issues:
-#
-# https://gem5.atlassian.net/browse/GEM5-494
+# in a test failure. This is outlined in the following Jira issue:
# https://gem5.atlassian.net/browse/GEM5-496
-# https://gem5.atlassian.net/browse/GEM5-497
binaries = (
'rv64samt-ps-sysclone_d',
'rv64samt-ps-sysfutex1_d',
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/43445
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: release-staging-v21-0
Gerrit-Change-Id: Ic1b477e1570765f33a41c5e852bf80a09c172545
Gerrit-Change-Number: 43445
Gerrit-PatchSet: 2
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[release-staging-v21-0]: misc: Update version number to v21.0.0.0
Bobby R. Bruce has submitted this change. ( https://gem5-review.googlesource.com/c/public/gem5/+/43405 ) Change subject: misc: Update version number to v21.0.0.0 .. misc: Update version number to v21.0.0.0 Change-Id: Ica7f7bfdcb1655e38defdf0b32a630e90adb7ce8 Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/43405 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 d453314..b83a8b1 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.2 +PROJECT_NUMBER = v21.0.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 cfa98f9..b46ca39 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.2]"; +const char *gem5Version = "21.0.0.0"; -- To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/43405 To unsubscribe, or for help writing mail filters, visit https://gem5-review.googlesource.com/settings Gerrit-Project: public/gem5 Gerrit-Branch: release-staging-v21-0 Gerrit-Change-Id: Ica7f7bfdcb1655e38defdf0b32a630e90adb7ce8 Gerrit-Change-Number: 43405 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-v21-0]: scons: Remove -Werror for the gem5 21.0 release
Bobby R. Bruce has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/43425 )
Change subject: scons: Remove -Werror for the gem5 21.0 release
..
scons: Remove -Werror for the gem5 21.0 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: Ic7bb17e770684211330c09143bd8a26720becb9a
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/43425
Reviewed-by: Bobby R. Bruce
Maintainer: Bobby R. Bruce
Tested-by: kokoro
---
M SConstruct
1 file changed, 0 insertions(+), 6 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 fb3421c..bcfd58f 100755
--- a/SConstruct
+++ b/SConstruct
@@ -322,12 +322,6 @@
if GetOption('gold_linker'):
main.Append(LINKFLAGS='-fuse-ld=gold')
-# 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/+/43425
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: release-staging-v21-0
Gerrit-Change-Id: Ic7bb17e770684211330c09143bd8a26720becb9a
Gerrit-Change-Number: 43425
Gerrit-PatchSet: 2
Gerrit-Owner: Bobby R. Bruce
Gerrit-Reviewer: Bobby R. Bruce
Gerrit-Reviewer: Gabe Black
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 v21.0.0.0 into develop
Bobby R. Bruce has uploaded this change for review. ( https://gem5-review.googlesource.com/c/public/gem5/+/43645 ) Change subject: misc: Merge branch v21.0.0.0 into develop .. misc: Merge branch v21.0.0.0 into develop This incorporates the last of the v21.0 staging branch changes into the develop branch. Change-Id: I89349ac5c52fd454eb87d6199ea5ccde0d50dda3 --- M src/arch/riscv/faults.cc 2 files changed, 0 insertions(+), 3 deletions(-) diff --git a/src/arch/riscv/faults.cc b/src/arch/riscv/faults.cc index d64d698..19e6449 100644 --- a/src/arch/riscv/faults.cc +++ b/src/arch/riscv/faults.cc @@ -31,11 +31,8 @@ #include "arch/riscv/faults.hh" -<<< HEAD (c9415d gpu-compute: Remove unused functions) #include "arch/riscv/fs_workload.hh" #include "arch/riscv/insts/static_inst.hh" -=== ->>> BRANCH (ea7d01 misc: Add release notes for v21.0.0.0) #include "arch/riscv/isa.hh" #include "arch/riscv/registers.hh" #include "arch/riscv/utility.hh" -- To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/43645 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: I89349ac5c52fd454eb87d6199ea5ccde0d50dda3 Gerrit-Change-Number: 43645 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 removal of -Werror for gem5 21.0
Bobby R. Bruce has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/43646 )
Change subject: misc: revert removal of -Werror for gem5 21.0
..
misc: revert removal of -Werror for gem5 21.0
This reverts:
https://gem5-review.googlesource.com/c/public/gem5/+/43425
Change-Id: Ic239150a7f2968744e40df40a6c03a942dc41ea6
---
M SConstruct
1 file changed, 6 insertions(+), 0 deletions(-)
diff --git a/SConstruct b/SConstruct
index 5b3e761..ae4c86a 100755
--- a/SConstruct
+++ b/SConstruct
@@ -322,6 +322,12 @@
if GetOption('gold_linker'):
main.Append(LINKFLAGS='-fuse-ld=gold')
+# 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/+/43646
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: Ic239150a7f2968744e40df40a6c03a942dc41ea6
Gerrit-Change-Number: 43646
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: Update version to "DEVELOP-FOR-V21.1"
Bobby R. Bruce has uploaded this change for review. ( https://gem5-review.googlesource.com/c/public/gem5/+/43647 ) Change subject: misc: Update version to "DEVELOP-FOR-V21.1" .. misc: Update version to "DEVELOP-FOR-V21.1" Change-Id: I8a0812bddabd7f124adab857cd39720e97a0bf48 --- M src/Doxyfile M src/base/version.cc 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Doxyfile b/src/Doxyfile index b83a8b1..9a10937 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 = v21.0.0.0 +PROJECT_NUMBER = DEVELOP-FOR-V21.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 b46ca39..3f15431 100644 --- a/src/base/version.cc +++ b/src/base/version.cc @@ -29,4 +29,4 @@ /** * @ingroup api_base_utils */ -const char *gem5Version = "21.0.0.0"; +const char *gem5Version = "[DEVELOP-FOR-V21.1]"; -- To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/43647 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: I8a0812bddabd7f124adab857cd39720e97a0bf48 Gerrit-Change-Number: 43647 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: revert removal of -Werror for gem5 21.0
Bobby R. Bruce has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/43646 )
Change subject: scons: revert removal of -Werror for gem5 21.0
..
scons: revert removal of -Werror for gem5 21.0
This reverts:
https://gem5-review.googlesource.com/c/public/gem5/+/43425
Change-Id: Ic239150a7f2968744e40df40a6c03a942dc41ea6
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/43646
Reviewed-by: Bobby R. Bruce
Maintainer: Bobby R. Bruce
Tested-by: kokoro
---
M SConstruct
1 file changed, 6 insertions(+), 0 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 5b3e761..ae4c86a 100755
--- a/SConstruct
+++ b/SConstruct
@@ -322,6 +322,12 @@
if GetOption('gold_linker'):
main.Append(LINKFLAGS='-fuse-ld=gold')
+# 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/+/43646
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: Ic239150a7f2968744e40df40a6c03a942dc41ea6
Gerrit-Change-Number: 43646
Gerrit-PatchSet: 4
Gerrit-Owner: Bobby R. Bruce
Gerrit-Reviewer: Bobby R. Bruce
Gerrit-Reviewer: Gabe Black
Gerrit-Reviewer: Jason Lowe-Power
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]: misc: Update version to "DEVELOP-FOR-V21.1"
Bobby R. Bruce has submitted this change. ( https://gem5-review.googlesource.com/c/public/gem5/+/43647 ) Change subject: misc: Update version to "DEVELOP-FOR-V21.1" .. misc: Update version to "DEVELOP-FOR-V21.1" Change-Id: I8a0812bddabd7f124adab857cd39720e97a0bf48 Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/43647 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 b83a8b1..9a10937 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 = v21.0.0.0 +PROJECT_NUMBER = DEVELOP-FOR-V21.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 b46ca39..3f15431 100644 --- a/src/base/version.cc +++ b/src/base/version.cc @@ -29,4 +29,4 @@ /** * @ingroup api_base_utils */ -const char *gem5Version = "21.0.0.0"; +const char *gem5Version = "[DEVELOP-FOR-V21.1]"; -- To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/43647 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: I8a0812bddabd7f124adab857cd39720e97a0bf48 Gerrit-Change-Number: 43647 Gerrit-PatchSet: 4 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: Merge branch v21.0.0.0 into develop
Bobby R. Bruce has submitted this change. ( https://gem5-review.googlesource.com/c/public/gem5/+/43645 ) Change subject: misc: Merge branch v21.0.0.0 into develop .. misc: Merge branch v21.0.0.0 into develop This incorporates the last of the v21.0 staging branch changes into the develop branch. Change-Id: I89349ac5c52fd454eb87d6199ea5ccde0d50dda3 --- M src/arch/riscv/faults.cc 2 files changed, 0 insertions(+), 4 deletions(-) Approvals: Bobby R. Bruce: Looks good to me, approved; Looks good to me, approved kokoro: Regressions pass diff --git a/src/arch/riscv/faults.cc b/src/arch/riscv/faults.cc index d64d698..c77d899 100644 --- a/src/arch/riscv/faults.cc +++ b/src/arch/riscv/faults.cc @@ -31,11 +31,7 @@ #include "arch/riscv/faults.hh" -<<< HEAD (c9415d gpu-compute: Remove unused functions) -#include "arch/riscv/fs_workload.hh" #include "arch/riscv/insts/static_inst.hh" -=== ->>> BRANCH (ea7d01 misc: Add release notes for v21.0.0.0) #include "arch/riscv/isa.hh" #include "arch/riscv/registers.hh" #include "arch/riscv/utility.hh" -- To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/43645 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: I89349ac5c52fd454eb87d6199ea5ccde0d50dda3 Gerrit-Change-Number: 43645 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]: misc,mem-ruby: Fixing unused variable error for fast builds
Bobby R. Bruce has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/44086 )
Change subject: misc,mem-ruby: Fixing unused variable error for fast builds
..
misc,mem-ruby: Fixing unused variable error for fast builds
This fixes the broken compiler tests for .fast builds:
https://www.mail-archive.com/gem5-dev@gem5.org/msg38412.html
Change-Id: Ibc377a57ce6455ca709003f326b0ca8d4c01377b
---
M src/mem/ruby/protocol/chi/CHI-cache-actions.sm
M src/mem/ruby/protocol/chi/CHI-cache-ports.sm
M src/mem/ruby/protocol/chi/CHI-mem.sm
3 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/src/mem/ruby/protocol/chi/CHI-cache-actions.sm
b/src/mem/ruby/protocol/chi/CHI-cache-actions.sm
index ea5eaff..32fdff1 100644
--- a/src/mem/ruby/protocol/chi/CHI-cache-actions.sm
+++ b/src/mem/ruby/protocol/chi/CHI-cache-actions.sm
@@ -1844,10 +1844,10 @@
action(UpdateDataState_FromWUDataResp, desc="") {
assert(is_valid(tbe));
- int offset := addressOffset(tbe.accAddr, tbe.addr);
if (tbe.expected_req_resp.hasReceivedData()) {
-assert(tbe.dataBlkValid.test(offset));
-assert(tbe.dataBlkValid.test(offset + tbe.accSize - 1));
+assert(tbe.dataBlkValid.test(addressOffset(tbe.accAddr, tbe.addr)));
+assert(tbe.dataBlkValid.test(addressOffset(tbe.accAddr, tbe.addr)
+ + tbe.accSize - 1));
peek(datInPort, CHIDataMsg) {
assert(in_msg.type == CHIDataType:NCBWrData);
tbe.dataDirty := true;
@@ -2678,13 +2678,11 @@
// pick a victim to deallocate
Addr victim_addr := cache.cacheProbe(address);
-CacheEntry victim_entry := getCacheEntry(victim_addr);
-assert(is_valid(victim_entry));
TBE victim_tbe := getCurrentActiveTBE(victim_addr);
if (is_invalid(victim_tbe)) {
DPRINTF(RubySlicc, "Eviction for %#x victim: %#x state=%s\n",
- address, victim_addr, victim_entry.state);
+ address, victim_addr,
getCacheEntry(victim_addr));
enqueue(replTriggerOutPort, ReplacementMsg, 0) {
out_msg.addr := victim_addr;
out_msg.from_addr := address;
diff --git a/src/mem/ruby/protocol/chi/CHI-cache-ports.sm
b/src/mem/ruby/protocol/chi/CHI-cache-ports.sm
index 6a4fe5b..efba9bc 100644
--- a/src/mem/ruby/protocol/chi/CHI-cache-ports.sm
+++ b/src/mem/ruby/protocol/chi/CHI-cache-ports.sm
@@ -96,8 +96,8 @@
if (datInPort.isReady(clockEdge())) {
printResources();
peek(datInPort, CHIDataMsg) {
- int received := in_msg.bitMask.count();
- assert((received <= data_channel_size) && (received > 0));
+ assert((in_msg.bitMask.count() <= data_channel_size)
+ && (in_msg.bitMask.count() > 0));
trigger(dataToEvent(in_msg.type), in_msg.addr,
getCacheEntry(in_msg.addr),
getCurrentActiveTBE(in_msg.addr));
}
diff --git a/src/mem/ruby/protocol/chi/CHI-mem.sm
b/src/mem/ruby/protocol/chi/CHI-mem.sm
index 954a449..a3d04eb 100644
--- a/src/mem/ruby/protocol/chi/CHI-mem.sm
+++ b/src/mem/ruby/protocol/chi/CHI-mem.sm
@@ -365,8 +365,9 @@
if (datInPort.isReady(clockEdge())) {
printResources();
peek(datInPort, CHIDataMsg) {
-int received := in_msg.bitMask.count();
-assert((received <= data_channel_size) && (received > 0));
+//int received := in_msg.bitMask.count();
+assert((in_msg.bitMask.count() <= data_channel_size)
+&& (in_msg.bitMask.count() > 0));
trigger(dataToEvent(in_msg.type), in_msg.addr, TBEs[in_msg.addr]);
}
}
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/44086
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: Ibc377a57ce6455ca709003f326b0ca8d4c01377b
Gerrit-Change-Number: 44086
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,mem-ruby: Fixing unused variable error for fast builds
Bobby R. Bruce has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/44086 )
Change subject: misc,mem-ruby: Fixing unused variable error for fast builds
..
misc,mem-ruby: Fixing unused variable error for fast builds
This fixes the broken compiler tests for .fast builds:
https://www.mail-archive.com/gem5-dev@gem5.org/msg38412.html
Change-Id: Ibc377a57ce6455ca709003f326b0ca8d4c01377b
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/44086
Reviewed-by: Gabe Black
Reviewed-by: Tiago Mück
Reviewed-by: Jason Lowe-Power
Maintainer: Bobby R. Bruce
Tested-by: kokoro
---
M src/mem/ruby/protocol/chi/CHI-cache-actions.sm
M src/mem/ruby/protocol/chi/CHI-cache-ports.sm
M src/mem/ruby/protocol/chi/CHI-mem.sm
3 files changed, 10 insertions(+), 8 deletions(-)
Approvals:
Jason Lowe-Power: Looks good to me, approved
Tiago Mück: Looks good to me, but someone else must approve
Gabe Black: Looks good to me, but someone else must approve
Bobby R. Bruce: Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/mem/ruby/protocol/chi/CHI-cache-actions.sm
b/src/mem/ruby/protocol/chi/CHI-cache-actions.sm
index ea5eaff..b1a7d99 100644
--- a/src/mem/ruby/protocol/chi/CHI-cache-actions.sm
+++ b/src/mem/ruby/protocol/chi/CHI-cache-actions.sm
@@ -1844,10 +1844,10 @@
action(UpdateDataState_FromWUDataResp, desc="") {
assert(is_valid(tbe));
- int offset := addressOffset(tbe.accAddr, tbe.addr);
if (tbe.expected_req_resp.hasReceivedData()) {
-assert(tbe.dataBlkValid.test(offset));
-assert(tbe.dataBlkValid.test(offset + tbe.accSize - 1));
+assert(tbe.dataBlkValid.test(addressOffset(tbe.accAddr, tbe.addr)));
+assert(tbe.dataBlkValid.test(addressOffset(tbe.accAddr, tbe.addr)
+ + tbe.accSize - 1));
peek(datInPort, CHIDataMsg) {
assert(in_msg.type == CHIDataType:NCBWrData);
tbe.dataDirty := true;
@@ -2682,7 +2682,9 @@
assert(is_valid(victim_entry));
TBE victim_tbe := getCurrentActiveTBE(victim_addr);
-if (is_invalid(victim_tbe)) {
+// The `is_valid(victim_entry)` condition here is to avoid an unused
+// variable error when compiling to gem5.fast.
+if (is_invalid(victim_tbe) && is_valid(victim_entry)) {
DPRINTF(RubySlicc, "Eviction for %#x victim: %#x state=%s\n",
address, victim_addr, victim_entry.state);
enqueue(replTriggerOutPort, ReplacementMsg, 0) {
diff --git a/src/mem/ruby/protocol/chi/CHI-cache-ports.sm
b/src/mem/ruby/protocol/chi/CHI-cache-ports.sm
index 6a4fe5b..efba9bc 100644
--- a/src/mem/ruby/protocol/chi/CHI-cache-ports.sm
+++ b/src/mem/ruby/protocol/chi/CHI-cache-ports.sm
@@ -96,8 +96,8 @@
if (datInPort.isReady(clockEdge())) {
printResources();
peek(datInPort, CHIDataMsg) {
- int received := in_msg.bitMask.count();
- assert((received <= data_channel_size) && (received > 0));
+ assert((in_msg.bitMask.count() <= data_channel_size)
+ && (in_msg.bitMask.count() > 0));
trigger(dataToEvent(in_msg.type), in_msg.addr,
getCacheEntry(in_msg.addr),
getCurrentActiveTBE(in_msg.addr));
}
diff --git a/src/mem/ruby/protocol/chi/CHI-mem.sm
b/src/mem/ruby/protocol/chi/CHI-mem.sm
index 954a449..08f8b8e 100644
--- a/src/mem/ruby/protocol/chi/CHI-mem.sm
+++ b/src/mem/ruby/protocol/chi/CHI-mem.sm
@@ -365,8 +365,8 @@
if (datInPort.isReady(clockEdge())) {
printResources();
peek(datInPort, CHIDataMsg) {
-int received := in_msg.bitMask.count();
-assert((received <= data_channel_size) && (received > 0));
+assert((in_msg.bitMask.count() <= data_channel_size)
+&& (in_msg.bitMask.count() > 0));
trigger(dataToEvent(in_msg.type), in_msg.addr, TBEs[in_msg.addr]);
}
}
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/44086
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: Ibc377a57ce6455ca709003f326b0ca8d4c01377b
Gerrit-Change-Number: 44086
Gerrit-PatchSet: 5
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: Tiago Mück
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]: python,tests: Update pyunit tests to run in TestLib
Bobby R. Bruce has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/44625 )
Change subject: python,tests: Update pyunit tests to run in TestLib
..
python,tests: Update pyunit tests to run in TestLib
Previously the pyunit tests needed run in the gem5 root, this change
allows them to run as part of the quick TestLib tests (thereby having
them run as part of the presubmit checks).
`pyunit/util/test_convert.py` has been renamed
`pyunit/util/convert-test.py` as TestLib attempts to parse any Python
file with the "test" prefix.
Example usage:
```
./main.py run --uid
SuiteUID:tests/pyunit/test_run.py:pyunit-convert-check-NULL-x86_64-opt
```
Discussed briefly in email thread:
https://www.mail-archive.com/gem5-dev@gem5.org/msg38563.html
Change-Id: Id566d44fcb5d8c599eb1a90bca56793158a201e6
---
A tests/pyunit/test_run.py
R tests/pyunit/util/convert-check.py
2 files changed, 49 insertions(+), 0 deletions(-)
diff --git a/tests/pyunit/test_run.py b/tests/pyunit/test_run.py
new file mode 100644
index 000..6dfe7e1
--- /dev/null
+++ b/tests/pyunit/test_run.py
@@ -0,0 +1,49 @@
+# Copyright (c) 2021 The Regents of the University of California
+# All Rights Reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met: redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer;
+# redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution;
+# neither the name of the copyright holders nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+import os
+
+from testlib.configuration import constants
+from testlib.helper import joinpath
+from gem5.suite import *
+
+# A map of test names to their configs. This is where the name of the test
is
+# set.
+test_configs = {
+"pyunit-convert-check" :
+str(joinpath(os.getcwd(), "util", "convert_check.py")),
+}
+
+for name in test_configs:
+gem5_verify_config(
+name=name,
+config=test_configs[name],
+verifiers=(),
+config_args=[],
+valid_isas=(constants.null_tag,),
+length = constants.quick_tag,
+)
+
diff --git a/tests/pyunit/util/test_convert.py
b/tests/pyunit/util/convert-check.py
similarity index 100%
rename from tests/pyunit/util/test_convert.py
rename to tests/pyunit/util/convert-check.py
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/44625
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: Id566d44fcb5d8c599eb1a90bca56793158a201e6
Gerrit-Change-Number: 44625
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[minor-release-staging-v21-0-1]: python,misc: Fix develop resources URL to v21-0
Bobby R. Bruce has uploaded this change for review. ( https://gem5-review.googlesource.com/c/public/gem5/+/44725 ) Change subject: python,misc: Fix develop resources URL to v21-0 .. python,misc: Fix develop resources URL to v21-0 This was incorrectly kept as `http://dist.gem5.org/dist/develop` in the v21.0.0 release of gem5. The `dist/develop` directory is used by the develop branch, not by gem5 releases. This change updates the URL to point towards the currect v21-0 branch, which will remain stable and contain resoruces always compatible with the v21-0 release. Change-Id: I5d9a9497cebffa91f08be253f1637e11e0d5e62c --- M ext/testlib/configuration.py 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/testlib/configuration.py b/ext/testlib/configuration.py index 1fffab4..18bebdd 100644 --- a/ext/testlib/configuration.py +++ b/ext/testlib/configuration.py @@ -213,7 +213,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/v21-0' defaults.resource_path = os.path.abspath(os.path.join(defaults.base_dir, 'tests', 'gem5', -- To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/44725 To unsubscribe, or for help writing mail filters, visit https://gem5-review.googlesource.com/settings Gerrit-Project: public/gem5 Gerrit-Branch: minor-release-staging-v21-0-1 Gerrit-Change-Id: I5d9a9497cebffa91f08be253f1637e11e0d5e62c Gerrit-Change-Number: 44725 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[minor-release-staging-v21-0-1]: sim: Fix Temperature class
Bobby R. Bruce has uploaded this change for review. ( https://gem5-review.googlesource.com/c/public/gem5/+/44745 ) Change subject: sim: Fix Temperature class .. sim: Fix Temperature class * Adding __str__ method: To fix its printing on config.ini (Replacing with the Temperature value) * Replacing "fromKelvin" with from_kelvin (that's how pybind exports it) * Fixing config_value to allow JSON serialization (JIRA: https://gem5.atlassian.net/browse/GEM5-951) Change-Id: I1aaea9c9df6466a5cbed0a29c5937243796948d2 Signed-off-by: Giacomo Travaglini Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/44167 Reviewed-by: Andreas Sandberg Reviewed-by: Jason Lowe-Power Maintainer: Andreas Sandberg Tested-by: kokoro (cherry picked from commit 6cb9c3e87fa8034122310613079ae4f058f93233) --- M src/python/m5/params.py 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/python/m5/params.py b/src/python/m5/params.py index d2366f6..78be6f6 100644 --- a/src/python/m5/params.py +++ b/src/python/m5/params.py @@ -1705,12 +1705,15 @@ self.__init__(value) return value +def __str__(self): +return str(self.value) + def getValue(self): from _m5.core import Temperature -return Temperature.fromKelvin(self.value) +return Temperature.from_kelvin(self.value) def config_value(self): -return self +return self.value @classmethod def cxx_predecls(cls, code): -- To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/44745 To unsubscribe, or for help writing mail filters, visit https://gem5-review.googlesource.com/settings Gerrit-Project: public/gem5 Gerrit-Branch: minor-release-staging-v21-0-1 Gerrit-Change-Id: I1aaea9c9df6466a5cbed0a29c5937243796948d2 Gerrit-Change-Number: 44745 Gerrit-PatchSet: 1 Gerrit-Owner: Bobby R. Bruce Gerrit-CC: Giacomo Travaglini 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: Fix .fast compilation errors for GCN3_x86
Bobby R. Bruce has uploaded this change for review. ( https://gem5-review.googlesource.com/c/public/gem5/+/44885 ) Change subject: arch-gcn3,misc: Fix .fast compilation errors for GCN3_x86 .. arch-gcn3,misc: Fix .fast compilation errors for GCN3_x86 Unused variable errors occurred when compiling gem5.fast with GCC. This patch fixes this. Change-Id: Iaca1fb8194c2381c0a4ba5d0ea1fb5b8f2a11829 --- M src/dev/hsa/hsa_packet_processor.cc M src/gpu-compute/gpu_compute_driver.cc 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/dev/hsa/hsa_packet_processor.cc b/src/dev/hsa/hsa_packet_processor.cc index cd6ef5a..eeb64da 100644 --- a/src/dev/hsa/hsa_packet_processor.cc +++ b/src/dev/hsa/hsa_packet_processor.cc @@ -133,8 +133,7 @@ "%s: write of size %d to reg-offset %d (0x%x)\n", __FUNCTION__, pkt->getSize(), daddr, daddr); -int doorbellSize = gpu_device->driver()->doorbellSize(); -assert(doorbellSize == pkt->getSize()); +assert(gpu_device->driver()->doorbellSize() == pkt->getSize()); uint64_t doorbell_reg(0); if (pkt->getSize() == 8) diff --git a/src/gpu-compute/gpu_compute_driver.cc b/src/gpu-compute/gpu_compute_driver.cc index 8c79be3..ac42752 100644 --- a/src/gpu-compute/gpu_compute_driver.cc +++ b/src/gpu-compute/gpu_compute_driver.cc @@ -582,7 +582,7 @@ assert(isdGPU); assert((args->va_addr % TheISA::PageBytes) == 0); -Addr mmap_offset = 0; +M5_VAR_USED Addr mmap_offset = 0; Request::CacheCoherenceFlags mtype = defaultMtype; Addr pa_addr = 0; -- To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/44885 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: Iaca1fb8194c2381c0a4ba5d0ea1fb5b8f2a11829 Gerrit-Change-Number: 44885 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]: python,tests: Update pyunit tests to run in TestLib
Bobby R. Bruce has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/44625 )
Change subject: python,tests: Update pyunit tests to run in TestLib
..
python,tests: Update pyunit tests to run in TestLib
Previously the pyunit tests needed run in the gem5 root, this change
allows them to run as part of the quick TestLib tests (thereby having
them run as part of the presubmit checks). This runs all the TestLib
tests as a single test using the NULL gem5 binary.
`tests/run_pyunit.py` has been updated to only parse files with the
`pyunit` prefix in their filname. As such `pyunit/util/test_convert.py`
has been renamed `pyunit/util/pyunit_convert_check.py`. The word `test`
has been removed entirely as to not clash with the testlib tests as run
by `tests/main.py`.
Example usage:
```
./main.py run --uid
SuiteUID:tests/pyunit/test_run.py:pyunit-tests-NULL-x86_64-opt
```
Discussed briefly in email thread:
https://www.mail-archive.com/gem5-dev@gem5.org/msg38563.html
Change-Id: Id566d44fcb5d8c599eb1a90bca56793158a201e6
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/44625
Reviewed-by: Andreas Sandberg
Maintainer: Bobby R. Bruce
Tested-by: kokoro
---
A tests/pyunit/test_run.py
R tests/pyunit/util/pyunit_convert_check.py
M tests/run_pyunit.py
3 files changed, 49 insertions(+), 1 deletion(-)
Approvals:
Andreas Sandberg: Looks good to me, approved
Bobby R. Bruce: Looks good to me, approved
kokoro: Regressions pass
diff --git a/tests/pyunit/test_run.py b/tests/pyunit/test_run.py
new file mode 100644
index 000..2accd4c
--- /dev/null
+++ b/tests/pyunit/test_run.py
@@ -0,0 +1,48 @@
+# Copyright (c) 2021 The Regents of the University of California
+# All Rights Reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met: redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer;
+# redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution;
+# neither the name of the copyright holders nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+import os
+
+from testlib.configuration import constants
+from gem5.suite import *
+
+'''
+As the filename begins with `test_`, it will be added to the TestLib
testsuite
+when `../main.py` is run.
+
+The purpose of this file is to ensure the pyunit tests are executed as part
+of a typical TestLib execution. These have been added as part of
the "quick"
+tests and will run with NULL/gem5.*
+'''
+
+gem5_verify_config(
+name="pyunit-tests",
+config=os.path.join(os.getcwd(), os.pardir, 'run_pyunit.py'),
+verifiers=(),
+config_args=[],
+valid_isas=(constants.null_tag,),
+length = constants.quick_tag,
+)
\ No newline at end of file
diff --git a/tests/pyunit/util/test_convert.py
b/tests/pyunit/util/pyunit_convert_check.py
similarity index 100%
rename from tests/pyunit/util/test_convert.py
rename to tests/pyunit/util/pyunit_convert_check.py
diff --git a/tests/run_pyunit.py b/tests/run_pyunit.py
index dcd8984..00f5f9c 100644
--- a/tests/run_pyunit.py
+++ b/tests/run_pyunit.py
@@ -44,7 +44,7 @@
import unittest
loader = unittest.TestLoader()
-tests = loader.discover("pyunit")
+tests = loader.discover("pyunit", pattern='pyunit*.py')
runner = unittest.runner.TextTestRunner(verbosity=2)
runner.run(tests)
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/44625
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: Id566d44fcb5d8c599eb1a90bca56793158a201e6
Gerrit-Change-Number: 44625
Gerrit-PatchSet: 4
Gerrit-Owner: Bobby R. Bruce
Gerrit-Reviewer: Andreas
[gem5-dev] Change in gem5/gem5[develop]: scons: Revert "Enable LTO for opt, perf and prof builds."
Bobby R. Bruce has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/44886 )
Change subject: scons: Revert "Enable LTO for opt, perf and prof builds."
..
scons: Revert "Enable LTO for opt, perf and prof builds."
This reverts
https://gem5-review.googlesource.com/c/public/gem5/+/40815
Change-Id: I7dbd2b70c90c98f38c7c02eb052571f7b6bd
---
M SConstruct
M src/SConscript
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/SConstruct b/SConstruct
index 3e2df39..f3d65f0 100755
--- a/SConstruct
+++ b/SConstruct
@@ -328,7 +328,9 @@
error('gcc version 5 or newer required.\n'
'Installed version:', main['CXXVERSION'])
-# If not disabled, set the Link-Time Optimization (LTO) flags.
+# Add the appropriate Link-Time Optimization (LTO) flags
+# unless LTO is explicitly turned off. Note that these flags
+# are only used by the fast target.
if not GetOption('no_lto'):
# g++ uses "make" to parallelize LTO. The program can be overriden
with
# the environment variable "MAKE", but we currently make no
attempt to
diff --git a/src/SConscript b/src/SConscript
index 831f5c6..47aa2ea 100644
--- a/src/SConscript
+++ b/src/SConscript
@@ -1435,8 +1435,11 @@
# the optimization to the ldflags as LTO defers the optimization
# to link time
for target in ['opt', 'fast', 'prof', 'perf']:
-ccflags[target] += ['-O3'] + env['LTO_CCFLAGS']
-ldflags[target] += ['-O3'] + env['LTO_LDFLAGS']
+ccflags[target] += ['-O3']
+ldflags[target] += ['-O3']
+
+ccflags['fast'] += env['LTO_CCFLAGS']
+ldflags['fast'] += env['LTO_LDFLAGS']
elif env['CLANG']:
ccflags['debug'] += ['-g', '-O0']
# opt, fast, prof and perf all share the same cc flags
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/44886
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: I7dbd2b70c90c98f38c7c02eb052571f7b6bd
Gerrit-Change-Number: 44886
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: Add `--with-lto` flag to enabled LTO for all builds
Bobby R. Bruce has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/44887 )
Change subject: scons: Add `--with-lto` flag to enabled LTO for all builds
..
scons: Add `--with-lto` flag to enabled LTO for all builds
Change-Id: I2eea7d447703491675c02730707cf9026cface5f
---
M SConstruct
M src/SConscript
2 files changed, 50 insertions(+), 25 deletions(-)
diff --git a/SConstruct b/SConstruct
index f3d65f0..d192b91 100755
--- a/SConstruct
+++ b/SConstruct
@@ -107,6 +107,8 @@
help="Don't compress debug info in build files")
AddOption('--no-lto', action='store_true',
help='Disable Link-Time Optimization for fast')
+AddOption('--with-lto', action='store_true',
+ help='Enable Link-Time Optimization')
AddOption('--verbose', action='store_true',
help='Print full tool command lines')
AddOption('--without-python', action='store_true',
@@ -262,9 +264,32 @@
main.Prepend(CPPPATH=Dir('include'))
# Initialize the Link-Time Optimization (LTO) flags
+
+if GetOption('no_lto') and GetOption('with_lto'):
+error('\n'.join((
+ "`--no-lto` and `--with-lto` are both set. These are mutually ",
+ "exclusive flags. `--no-lto` disables LTO for .fast builds ",
+ "(enabled by default). `--with-lto` enables LTO for all
builds.")))
+
+
main['LTO_CCFLAGS'] = []
main['LTO_LDFLAGS'] = []
+# THE LTO flags to set for the .fast builds only (the other builds use
+# 'LTO_CCFLAGS' and 'LTO_LDFLAGS')
+main['LTO_CCFLAGS_FAST'] = []
+main['LTO_LDFLAGS_FAST'] = []
+
+lto_flags_to_set = []
+
+if not GetOption('no_lto'):
+lto_flags_to_set.append('LTO_CCFLAGS_FAST')
+lto_flags_to_set.append('LTO_LDFLAGS_FAST')
+if GetOption('with_lto'):
+lto_flags_to_set.append('LTO_CCFLAGS')
+lto_flags_to_set.append('LTO_LDFLAGS')
+
+
# According to the readme, tcmalloc works best if the compiler doesn't
# assume that we're using the builtin malloc and friends. These flags
# are compiler-specific, so we need to set them after we detect which
@@ -329,22 +354,23 @@
'Installed version:', main['CXXVERSION'])
# Add the appropriate Link-Time Optimization (LTO) flags
-# unless LTO is explicitly turned off. Note that these flags
-# are only used by the fast target.
-if not GetOption('no_lto'):
-# g++ uses "make" to parallelize LTO. The program can be overriden
with
-# the environment variable "MAKE", but we currently make no
attempt to
-# plumb that variable through.
-parallelism = ''
-if main.Detect('make'):
-parallelism = '=%d' % GetOption('num_jobs')
-else:
-warning('"make" not found, link time optimization will be '
-'single threaded.')
+# Note that these flags are only used by .fast by default. If
`--no-lto` is
+# set .fast will link without LTO. If `--with-lto` is set, all gem5
+# variants (opt, debug, etc.) are linked with LTO.
+#
+# g++ uses "make" to parallelize LTO. The program can be overriden with
+# the environment variable "MAKE", but we currently make no attempt to
+# plumb that variable through.
+parallelism = ''
+if main.Detect('make'):
+parallelism = '=%d' % GetOption('num_jobs')
+else:
+warning('"make" not found, link time optimization will be '
+'single threaded.')
-for var in 'LTO_CCFLAGS', 'LTO_LDFLAGS':
-# Use the same amount of jobs for LTO as we are running scons
with.
-main[var] = ['-flto%s' % parallelism]
+for var in lto_flags_to_set:
+# Use the same amount of jobs for LTO as we are running scons with.
+main[var] = ['-flto%s' % parallelism]
main.Append(TCMALLOC_CCFLAGS=['-fno-builtin-malloc', '-fno-builtin-calloc',
'-fno-builtin-realloc', '-fno-builtin-free'])
@@ -354,10 +380,8 @@
error('clang version 3.9 or newer required.\n'
'Installed version:', main['CXXVERSION'])
-# If not disabled, set the Link-Time Optimization (LTO) flags.
-if not GetOption('no_lto'):
-for var in 'LTO_CCFLAGS', 'LTO_LDFLAGS':
-main[var] = ['-flto']
+for var in lto_flags_to_set:
+main[var] = ['-flto']
# clang has a few additional warnings that we disable.
with gem5_scons.Configure(main) as conf:
diff --git a/src/SConscript b/src/SConscript
index 47aa2ea..1daf3e6 100644
--- a/src/SConscript
+++ b/src/SConscript
@@ -1431,15 +1431,16 @@
else:
ccflags['debug'] += ['-ggdb3']
ldflags['debug'] += ['-O0']
-# opt, fast, prof and perf all share the same cc flags, also add
+# opt, prof and perf all share the same cc flags, also add
# the optimization to the ldflags as LTO defers the optimization
# to link time
-for target in ['opt', 'fast', 'prof', 'p
[gem5-dev] Change in gem5/gem5[develop]: arch-gcn3,misc: Fix .fast compilation errors for GCN3_x86
Bobby R. Bruce has submitted this change. ( https://gem5-review.googlesource.com/c/public/gem5/+/44885 ) Change subject: arch-gcn3,misc: Fix .fast compilation errors for GCN3_x86 .. arch-gcn3,misc: Fix .fast compilation errors for GCN3_x86 Unused variable errors occurred when compiling gem5.fast with GCC. This patch fixes this. Change-Id: Iaca1fb8194c2381c0a4ba5d0ea1fb5b8f2a11829 Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/44885 Reviewed-by: Bobby R. Bruce Reviewed-by: Matt Sinclair Reviewed-by: Matthew Poremba Maintainer: Bobby R. Bruce Tested-by: kokoro --- M src/dev/hsa/hsa_packet_processor.cc M src/gpu-compute/gpu_compute_driver.cc 2 files changed, 2 insertions(+), 3 deletions(-) Approvals: Matthew Poremba: Looks good to me, approved Matt Sinclair: Looks good to me, approved Bobby R. Bruce: Looks good to me, approved; Looks good to me, approved kokoro: Regressions pass diff --git a/src/dev/hsa/hsa_packet_processor.cc b/src/dev/hsa/hsa_packet_processor.cc index cd6ef5a..eeb64da 100644 --- a/src/dev/hsa/hsa_packet_processor.cc +++ b/src/dev/hsa/hsa_packet_processor.cc @@ -133,8 +133,7 @@ "%s: write of size %d to reg-offset %d (0x%x)\n", __FUNCTION__, pkt->getSize(), daddr, daddr); -int doorbellSize = gpu_device->driver()->doorbellSize(); -assert(doorbellSize == pkt->getSize()); +assert(gpu_device->driver()->doorbellSize() == pkt->getSize()); uint64_t doorbell_reg(0); if (pkt->getSize() == 8) diff --git a/src/gpu-compute/gpu_compute_driver.cc b/src/gpu-compute/gpu_compute_driver.cc index 8c79be3..ac42752 100644 --- a/src/gpu-compute/gpu_compute_driver.cc +++ b/src/gpu-compute/gpu_compute_driver.cc @@ -582,7 +582,7 @@ assert(isdGPU); assert((args->va_addr % TheISA::PageBytes) == 0); -Addr mmap_offset = 0; +M5_VAR_USED Addr mmap_offset = 0; Request::CacheCoherenceFlags mtype = defaultMtype; Addr pa_addr = 0; -- To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/44885 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: Iaca1fb8194c2381c0a4ba5d0ea1fb5b8f2a11829 Gerrit-Change-Number: 44885 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]: scons: Revert "Enable LTO for opt, perf and prof builds."
Bobby R. Bruce has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/44886 )
Change subject: scons: Revert "Enable LTO for opt, perf and prof builds."
..
scons: Revert "Enable LTO for opt, perf and prof builds."
This reverts
https://gem5-review.googlesource.com/c/public/gem5/+/40815
Change-Id: I7dbd2b70c90c98f38c7c02eb052571f7b6bd
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/44886
Reviewed-by: Jason Lowe-Power
Maintainer: Jason Lowe-Power
Tested-by: kokoro
---
M SConstruct
M src/SConscript
2 files changed, 8 insertions(+), 3 deletions(-)
Approvals:
Jason Lowe-Power: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/SConstruct b/SConstruct
index 3e2df39..f3d65f0 100755
--- a/SConstruct
+++ b/SConstruct
@@ -328,7 +328,9 @@
error('gcc version 5 or newer required.\n'
'Installed version:', main['CXXVERSION'])
-# If not disabled, set the Link-Time Optimization (LTO) flags.
+# Add the appropriate Link-Time Optimization (LTO) flags
+# unless LTO is explicitly turned off. Note that these flags
+# are only used by the fast target.
if not GetOption('no_lto'):
# g++ uses "make" to parallelize LTO. The program can be overriden
with
# the environment variable "MAKE", but we currently make no
attempt to
diff --git a/src/SConscript b/src/SConscript
index 831f5c6..47aa2ea 100644
--- a/src/SConscript
+++ b/src/SConscript
@@ -1435,8 +1435,11 @@
# the optimization to the ldflags as LTO defers the optimization
# to link time
for target in ['opt', 'fast', 'prof', 'perf']:
-ccflags[target] += ['-O3'] + env['LTO_CCFLAGS']
-ldflags[target] += ['-O3'] + env['LTO_LDFLAGS']
+ccflags[target] += ['-O3']
+ldflags[target] += ['-O3']
+
+ccflags['fast'] += env['LTO_CCFLAGS']
+ldflags['fast'] += env['LTO_LDFLAGS']
elif env['CLANG']:
ccflags['debug'] += ['-g', '-O0']
# opt, fast, prof and perf all share the same cc flags
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/44886
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: I7dbd2b70c90c98f38c7c02eb052571f7b6bd
Gerrit-Change-Number: 44886
Gerrit-PatchSet: 2
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[develop]: scons: Add `--with-lto` to enabled LTO; remove `--no-lto`
Bobby R. Bruce has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/44887 )
Change subject: scons: Add `--with-lto` to enabled LTO; remove `--no-lto`
..
scons: Add `--with-lto` to enabled LTO; remove `--no-lto`
LTO is no longer enabled by default and can instead be enabled by
`--with-lto`.
Change-Id: I2eea7d447703491675c02730707cf9026cface5f
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/44887
Reviewed-by: Jason Lowe-Power
Reviewed-by: Gabe Black
Maintainer: Jason Lowe-Power
Tested-by: kokoro
---
M SConstruct
M src/SConscript
2 files changed, 9 insertions(+), 12 deletions(-)
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/SConstruct b/SConstruct
index f3d65f0..53fa124 100755
--- a/SConstruct
+++ b/SConstruct
@@ -105,8 +105,8 @@
AddOption('--gold-linker', action='store_true', help='Use the gold linker')
AddOption('--no-compress-debug', action='store_true',
help="Don't compress debug info in build files")
-AddOption('--no-lto', action='store_true',
- help='Disable Link-Time Optimization for fast')
+AddOption('--with-lto', action='store_true',
+ help='Enable Link-Time Optimization')
AddOption('--verbose', action='store_true',
help='Print full tool command lines')
AddOption('--without-python', action='store_true',
@@ -328,10 +328,9 @@
error('gcc version 5 or newer required.\n'
'Installed version:', main['CXXVERSION'])
-# Add the appropriate Link-Time Optimization (LTO) flags
-# unless LTO is explicitly turned off. Note that these flags
-# are only used by the fast target.
-if not GetOption('no_lto'):
+# Add the appropriate Link-Time Optimization (LTO) flags if
`--with-lto` is
+# set.
+if GetOption('with_lto'):
# g++ uses "make" to parallelize LTO. The program can be overriden
with
# the environment variable "MAKE", but we currently make no
attempt to
# plumb that variable through.
@@ -354,8 +353,8 @@
error('clang version 3.9 or newer required.\n'
'Installed version:', main['CXXVERSION'])
-# If not disabled, set the Link-Time Optimization (LTO) flags.
-if not GetOption('no_lto'):
+# Set the Link-Time Optimization (LTO) flags if enabled.
+if GetOption('with_lto'):
for var in 'LTO_CCFLAGS', 'LTO_LDFLAGS':
main[var] = ['-flto']
diff --git a/src/SConscript b/src/SConscript
index 47aa2ea..bf2d22e 100644
--- a/src/SConscript
+++ b/src/SConscript
@@ -1435,11 +1435,9 @@
# the optimization to the ldflags as LTO defers the optimization
# to link time
for target in ['opt', 'fast', 'prof', 'perf']:
-ccflags[target] += ['-O3']
-ldflags[target] += ['-O3']
+ccflags[target] += ['-O3'] + env['LTO_CCFLAGS']
+ldflags[target] += ['-O3'] + env['LTO_LDFLAGS']
-ccflags['fast'] += env['LTO_CCFLAGS']
-ldflags['fast'] += env['LTO_LDFLAGS']
elif env['CLANG']:
ccflags['debug'] += ['-g', '-O0']
# opt, fast, prof and perf all share the same cc flags
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/44887
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: I2eea7d447703491675c02730707cf9026cface5f
Gerrit-Change-Number: 44887
Gerrit-PatchSet: 4
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-gcn3: Add missing overrides
Bobby R. Bruce has uploaded this change for review. ( https://gem5-review.googlesource.com/c/public/gem5/+/45085 ) Change subject: arch-gcn3: Add missing overrides .. arch-gcn3: Add missing overrides These overrides are required to compile gcn3_x86 with clang. Change-Id: I65ece501f16a4fbf8ffdc6b754de69fb36ab7515 --- M src/gpu-compute/gpu_compute_driver.hh 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gpu-compute/gpu_compute_driver.hh b/src/gpu-compute/gpu_compute_driver.hh index 922a699..48ca876 100644 --- a/src/gpu-compute/gpu_compute_driver.hh +++ b/src/gpu-compute/gpu_compute_driver.hh @@ -65,9 +65,9 @@ GPUComputeDriver(const Params &p); int ioctl(ThreadContext *tc, unsigned req, Addr ioc_buf) override; -int open(ThreadContext *tc, int mode, int flags); +int open(ThreadContext *tc, int mode, int flags) override; Addr mmap(ThreadContext *tc, Addr start, uint64_t length, - int prot, int tgt_flags, int tgt_fd, off_t offset); + int prot, int tgt_flags, int tgt_fd, off_t offset) override; virtual void signalWakeupEvent(uint32_t event_id); void sleepCPU(ThreadContext *tc, uint32_t milliSecTimeout); /** -- To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/45085 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: I65ece501f16a4fbf8ffdc6b754de69fb36ab7515 Gerrit-Change-Number: 45085 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: Add missing overrides
Bobby R. Bruce has submitted this change. ( https://gem5-review.googlesource.com/c/public/gem5/+/45085 ) Change subject: arch-gcn3: Add missing overrides .. arch-gcn3: Add missing overrides These overrides are required to compile gcn3_x86 with clang. Change-Id: I65ece501f16a4fbf8ffdc6b754de69fb36ab7515 Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/45085 Maintainer: Bobby R. Bruce Reviewed-by: Matt Sinclair Tested-by: kokoro --- M src/gpu-compute/gpu_compute_driver.hh 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Matt Sinclair: Looks good to me, approved Bobby R. Bruce: Looks good to me, approved kokoro: Regressions pass diff --git a/src/gpu-compute/gpu_compute_driver.hh b/src/gpu-compute/gpu_compute_driver.hh index 922a699..48ca876 100644 --- a/src/gpu-compute/gpu_compute_driver.hh +++ b/src/gpu-compute/gpu_compute_driver.hh @@ -65,9 +65,9 @@ GPUComputeDriver(const Params &p); int ioctl(ThreadContext *tc, unsigned req, Addr ioc_buf) override; -int open(ThreadContext *tc, int mode, int flags); +int open(ThreadContext *tc, int mode, int flags) override; Addr mmap(ThreadContext *tc, Addr start, uint64_t length, - int prot, int tgt_flags, int tgt_fd, off_t offset); + int prot, int tgt_flags, int tgt_fd, off_t offset) override; virtual void signalWakeupEvent(uint32_t event_id); void sleepCPU(ThreadContext *tc, uint32_t milliSecTimeout); /** -- To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/45085 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: I65ece501f16a4fbf8ffdc6b754de69fb36ab7515 Gerrit-Change-Number: 45085 Gerrit-PatchSet: 2 Gerrit-Owner: Bobby R. Bruce Gerrit-Reviewer: Bobby R. Bruce 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[minor-release-staging-v21-0-1]: util,arch-gcn3: Fixing gcn-gpu Dockerfile to v21-0 bucket
Bobby R. Bruce has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/45146 )
Change subject: util,arch-gcn3: Fixing gcn-gpu Dockerfile to v21-0 bucket
..
util,arch-gcn3: Fixing gcn-gpu Dockerfile to v21-0 bucket
Was previously pointing towards the "develop" bucket which is subject to
change over time.
Change-Id: I769d8ac5dc2348e5a6477d75d883cc2a3add7bd3
---
M util/dockerfiles/gcn-gpu/Dockerfile
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/util/dockerfiles/gcn-gpu/Dockerfile
b/util/dockerfiles/gcn-gpu/Dockerfile
index e5683ab..2f5d1b4 100644
--- a/util/dockerfiles/gcn-gpu/Dockerfile
+++ b/util/dockerfiles/gcn-gpu/Dockerfile
@@ -52,7 +52,7 @@
RUN python3 get-pip.py
RUN pip install -U setuptools scons==3.1.2 six
-ARG gem5_dist=http://dist.gem5.org/dist/develop
+ARG gem5_dist=http://dist.gem5.org/dist/v21-0
# Install ROCm 1.6 binaries
RUN wget -qO- ${gem5_dist}/apt_1.6.4.tar.bz2 \
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/45146
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: minor-release-staging-v21-0-1
Gerrit-Change-Id: I769d8ac5dc2348e5a6477d75d883cc2a3add7bd3
Gerrit-Change-Number: 45146
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[minor-release-staging-v21-0-1]: util,arch-gcn3: Fixing gcn-gpu Dockerfile to v21-0 bucket
Bobby R. Bruce has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/45146 )
Change subject: util,arch-gcn3: Fixing gcn-gpu Dockerfile to v21-0 bucket
..
util,arch-gcn3: Fixing gcn-gpu Dockerfile to v21-0 bucket
Was previously pointing towards the "develop" bucket which is subject to
change over time.
Change-Id: I769d8ac5dc2348e5a6477d75d883cc2a3add7bd3
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/45146
Maintainer: Bobby R. Bruce
Reviewed-by: Matt Sinclair
Tested-by: kokoro
---
M util/dockerfiles/gcn-gpu/Dockerfile
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Matt Sinclair: Looks good to me, approved
Bobby R. Bruce: Looks good to me, approved
kokoro: Regressions pass
diff --git a/util/dockerfiles/gcn-gpu/Dockerfile
b/util/dockerfiles/gcn-gpu/Dockerfile
index e5683ab..2f5d1b4 100644
--- a/util/dockerfiles/gcn-gpu/Dockerfile
+++ b/util/dockerfiles/gcn-gpu/Dockerfile
@@ -52,7 +52,7 @@
RUN python3 get-pip.py
RUN pip install -U setuptools scons==3.1.2 six
-ARG gem5_dist=http://dist.gem5.org/dist/develop
+ARG gem5_dist=http://dist.gem5.org/dist/v21-0
# Install ROCm 1.6 binaries
RUN wget -qO- ${gem5_dist}/apt_1.6.4.tar.bz2 \
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/45146
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: minor-release-staging-v21-0-1
Gerrit-Change-Id: I769d8ac5dc2348e5a6477d75d883cc2a3add7bd3
Gerrit-Change-Number: 45146
Gerrit-PatchSet: 2
Gerrit-Owner: Bobby R. Bruce
Gerrit-Reviewer: Bobby R. Bruce
Gerrit-Reviewer: Gabe Black
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-arm,misc: Fix unused variable error with ARM .fast comp
Bobby R. Bruce has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/45479 )
Change subject: arch-arm,misc: Fix unused variable error with ARM .fast comp
..
arch-arm,misc: Fix unused variable error with ARM .fast comp
Change-Id: Ia65a0eb92f498fec379f93d081e7748aacf0724f
---
M src/arch/arm/nativetrace.cc
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/arch/arm/nativetrace.cc b/src/arch/arm/nativetrace.cc
index d1f6854..d94e21e 100644
--- a/src/arch/arm/nativetrace.cc
+++ b/src/arch/arm/nativetrace.cc
@@ -42,6 +42,7 @@
#include "arch/arm/regs/cc.hh"
#include "arch/arm/regs/misc.hh"
+#include "base/compiler.hh"
#include "cpu/thread_context.hh"
#include "debug/ExecRegDelta.hh"
#include "params/ArmNativeTrace.hh"
@@ -51,7 +52,7 @@
namespace Trace {
-static const char *regNames[] = {
+GEM5_VAR_USED static const char *regNames[] = {
"r0", "r1", "r2", "r3", "r4", "r5", "r6", "r7",
"r8", "r9", "r10", "fp", "r12", "sp", "lr", "pc",
"cpsr", "f0", "f1", "f2", "f3", "f4", "f5", "f6",
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/45479
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: Ia65a0eb92f498fec379f93d081e7748aacf0724f
Gerrit-Change-Number: 45479
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,tests: Fix debug.cc tests to reflect new API changes
Bobby R. Bruce has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/45480 )
Change subject: base,tests: Fix debug.cc tests to reflect new API changes
..
base,tests: Fix debug.cc tests to reflect new API changes
Due to simplifications in how the debug flag is enabled (here:
https://gem5-review.googlesource.com/c/public/gem5/+/45007), the
debug.cc.test tests were failing when compiled to .fast (`scons
build/NULL/unittests.fast`). This patch fixes the tests to work with
this new API.
Change-Id: Ifd49f698dcc9e5d2a81d4b4a9363b82dd8a91a97
---
M src/base/debug.test.cc
1 file changed, 20 insertions(+), 18 deletions(-)
diff --git a/src/base/debug.test.cc b/src/base/debug.test.cc
index 69ac095..03c6160 100644
--- a/src/base/debug.test.cc
+++ b/src/base/debug.test.cc
@@ -84,13 +84,13 @@
flag.enable();
ASSERT_FALSE(flag.tracing());
Debug::Flag::globalEnable();
-ASSERT_TRUE(flag.tracing());
+ASSERT_TRUE(!TRACING_ON || flag.tracing());
// Verify that the global enabler works
Debug::Flag::globalDisable();
ASSERT_FALSE(flag.tracing());
Debug::Flag::globalEnable();
-ASSERT_TRUE(flag.tracing());
+ASSERT_TRUE(!TRACING_ON || flag.tracing());
// Test disabling the flag with global enabled
flag.disable();
@@ -119,10 +119,10 @@
ASSERT_FALSE(flag.tracing());
Debug::Flag::globalEnable();
for (auto &kid : flag.kids()) {
-ASSERT_TRUE(kid->tracing());
+ASSERT_TRUE(!TRACING_ON || kid->tracing());
}
-ASSERT_TRUE(flag_a.tracing());
-ASSERT_TRUE(flag_b.tracing());
+ASSERT_TRUE(!TRACING_ON || flag_a.tracing());
+ASSERT_TRUE(!TRACING_ON || flag_b.tracing());
// Test disabling the flag with global enabled
flag.disable();
@@ -163,22 +163,22 @@
ASSERT_FALSE(flag_b.tracing());
ASSERT_FALSE(flag.tracing());
flag_a.enable();
-ASSERT_TRUE(flag_a.tracing());
+ASSERT_TRUE(!TRACING_ON || flag_a.tracing());
ASSERT_FALSE(flag_b.tracing());
ASSERT_FALSE(flag.tracing());
// Test that enabling both flags enables the compound flag
-ASSERT_TRUE(flag_a.tracing());
+ASSERT_TRUE(!TRACING_ON || flag_a.tracing());
ASSERT_FALSE(flag_b.tracing());
ASSERT_FALSE(flag.tracing());
flag_b.enable();
-ASSERT_TRUE(flag_a.tracing());
-ASSERT_TRUE(flag_b.tracing());
+ASSERT_TRUE(!TRACING_ON || flag_a.tracing());
+ASSERT_TRUE(!TRACING_ON || flag_b.tracing());
// Test that disabling one of the flags disables the compound flag
flag_a.disable();
ASSERT_FALSE(flag_a.tracing());
-ASSERT_TRUE(flag_b.tracing());
+ASSERT_TRUE(!TRACING_ON || flag_b.tracing());
ASSERT_FALSE(flag.tracing());
}
@@ -195,11 +195,11 @@
EXPECT_TRUE(flag = Debug::findFlag("FlagFindFlagTestA"));
ASSERT_FALSE(flag_a.tracing());
flag->enable();
-ASSERT_TRUE(flag_a.tracing());
+ASSERT_TRUE(!TRACING_ON || flag_a.tracing());
EXPECT_TRUE(flag = Debug::findFlag("FlagFindFlagTestB"));
ASSERT_FALSE(flag_b.tracing());
flag->enable();
-ASSERT_TRUE(flag_b.tracing());
+ASSERT_TRUE(!TRACING_ON || flag_b.tracing());
// Search for a non-existent flag
EXPECT_FALSE(Debug::findFlag("FlagFindFlagTestC"));
@@ -216,7 +216,7 @@
// enabled too
ASSERT_FALSE(flag_a.tracing());
EXPECT_TRUE(Debug::changeFlag("FlagChangeFlagTestA", true));
-ASSERT_TRUE(flag_a.tracing());
+ASSERT_TRUE(!TRACING_ON || flag_a.tracing());
EXPECT_TRUE(Debug::changeFlag("FlagChangeFlagTestA", false));
ASSERT_FALSE(flag_a.tracing());
@@ -225,7 +225,7 @@
EXPECT_TRUE(Debug::changeFlag("FlagChangeFlagTestB", false));
ASSERT_FALSE(flag_b.tracing());
EXPECT_TRUE(Debug::changeFlag("FlagChangeFlagTestB", true));
-ASSERT_TRUE(flag_b.tracing());
+ASSERT_TRUE(!TRACING_ON || flag_b.tracing());
// Change a non-existent flag
ASSERT_FALSE(Debug::changeFlag("FlagChangeFlagTestC", true));
@@ -241,7 +241,7 @@
// Enable and disable a flag
ASSERT_FALSE(flag_a.tracing());
setDebugFlag("FlagSetClearDebugFlagTestA");
-ASSERT_TRUE(flag_a.tracing());
+ASSERT_TRUE(!TRACING_ON || flag_a.tracing());
clearDebugFlag("FlagSetClearDebugFlagTestA");
ASSERT_FALSE(flag_a.tracing());
@@ -250,7 +250,7 @@
clearDebugFlag("FlagSetClearDebugFlagTestB");
ASSERT_FALSE(flag_b.tracing());
setDebugFlag("FlagSetClearDebugFlagTestB");
-ASSERT_TRUE(flag_b.tracing());
+ASSERT_TRUE(!TRACING_ON || flag_b.tracing());
// Change a non-existent flag
setDebugFlag("FlagSetClearDebugFlagTestC");
@@ -295,10 +295,12 @@
flag_c.enable();
compound_flag_b.enable();
-// Verify that the names of the enabled flags are printed
+// Verify that the names of the enabled flags are printed if
TRACING_ON.
+if (TRACING_ON) {
std::ostringstream os;
dumpDebugFlags(o
[gem5-dev] Change in gem5/gem5[develop]: arch-gcn3,misc: Fixing .fast compilation for gcn3
Bobby R. Bruce has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/45481 )
Change subject: arch-gcn3,misc: Fixing .fast compilation for gcn3
..
arch-gcn3,misc: Fixing .fast compilation for gcn3
DPRINTF was altered here:
https://gem5-review.googlesource.com/c/public/gem5/+/44988.
This change results in DPRINTFs always compiling. As such, the
variables decladed within NDEBUG ifdefs, and later used in DPRINTFs,
cause an error when compiling .fast. In this patch the NDEBUG ifdefs
have been removed.
Change-Id: I54992cfe152c84b265e64e1389bf2656c95ba42e
---
M src/gpu-compute/gpu_tlb.cc
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/gpu-compute/gpu_tlb.cc b/src/gpu-compute/gpu_tlb.cc
index f0afd827..dfe9a48 100644
--- a/src/gpu-compute/gpu_tlb.cc
+++ b/src/gpu-compute/gpu_tlb.cc
@@ -960,10 +960,10 @@
Process *p = sender_state->tc->getProcessPtr();
Addr vaddr = pkt->req->getVaddr();
-#ifndef NDEBUG
+
Addr alignedVaddr = p->pTable->pageAlign(vaddr);
assert(alignedVaddr == virtPageAddr);
-#endif
+
const EmulationPageTable::Entry *pte =
p->pTable->lookup(vaddr);
if (!pte && sender_state->tlbMode != BaseTLB::Execute &&
p->fixupFault(vaddr)) {
@@ -1164,10 +1164,9 @@
Process *p = tc->getProcessPtr();
Addr vaddr = pkt->req->getVaddr();
-#ifndef NDEBUG
+
Addr alignedVaddr = p->pTable->pageAlign(vaddr);
assert(alignedVaddr == virt_page_addr);
-#endif
const EmulationPageTable::Entry *pte =
p->pTable->lookup(vaddr);
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/45481
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: I54992cfe152c84b265e64e1389bf2656c95ba42e
Gerrit-Change-Number: 45481
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: Fixing .fast compilation for gcn3
Bobby R. Bruce has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/45481 )
Change subject: arch-gcn3: Fixing .fast compilation for gcn3
..
arch-gcn3: Fixing .fast compilation for gcn3
DPRINTF was altered here:
https://gem5-review.googlesource.com/c/public/gem5/+/44988.
This change results in DPRINTFs always compiling. As such, the
variables decladed within NDEBUG ifdefs, and later used in DPRINTFs,
cause an error when compiling .fast. In this patch the NDEBUG ifdefs
have been removed.
Change-Id: I54992cfe152c84b265e64e1389bf2656c95ba42e
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/45481
Reviewed-by: Matthew Poremba
Reviewed-by: Matt Sinclair
Maintainer: Matthew Poremba
Maintainer: Matt Sinclair
Tested-by: kokoro
---
M src/gpu-compute/gpu_tlb.cc
1 file changed, 3 insertions(+), 4 deletions(-)
Approvals:
Matthew Poremba: 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_tlb.cc b/src/gpu-compute/gpu_tlb.cc
index f0afd827..dfe9a48 100644
--- a/src/gpu-compute/gpu_tlb.cc
+++ b/src/gpu-compute/gpu_tlb.cc
@@ -960,10 +960,10 @@
Process *p = sender_state->tc->getProcessPtr();
Addr vaddr = pkt->req->getVaddr();
-#ifndef NDEBUG
+
Addr alignedVaddr = p->pTable->pageAlign(vaddr);
assert(alignedVaddr == virtPageAddr);
-#endif
+
const EmulationPageTable::Entry *pte =
p->pTable->lookup(vaddr);
if (!pte && sender_state->tlbMode != BaseTLB::Execute &&
p->fixupFault(vaddr)) {
@@ -1164,10 +1164,9 @@
Process *p = tc->getProcessPtr();
Addr vaddr = pkt->req->getVaddr();
-#ifndef NDEBUG
+
Addr alignedVaddr = p->pTable->pageAlign(vaddr);
assert(alignedVaddr == virt_page_addr);
-#endif
const EmulationPageTable::Entry *pte =
p->pTable->lookup(vaddr);
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/45481
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: I54992cfe152c84b265e64e1389bf2656c95ba42e
Gerrit-Change-Number: 45481
Gerrit-PatchSet: 3
Gerrit-Owner: Bobby R. Bruce
Gerrit-Reviewer: Bobby R. Bruce
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,tests: Fix debug.cc tests to reflect new API changes
Bobby R. Bruce has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/45480 )
Change subject: base,tests: Fix debug.cc tests to reflect new API changes
..
base,tests: Fix debug.cc tests to reflect new API changes
Due to simplifications in how the debug flag is enabled (here:
https://gem5-review.googlesource.com/c/public/gem5/+/45007), the
debug.cc.test tests were failing when compiled to .fast (`scons
build/NULL/unittests.fast`). This patch fixes the tests to work with
this new API.
Change-Id: Ifd49f698dcc9e5d2a81d4b4a9363b82dd8a91a97
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/45480
Reviewed-by: Daniel Carvalho
Maintainer: Jason Lowe-Power
Tested-by: kokoro
---
M src/base/debug.test.cc
1 file changed, 24 insertions(+), 22 deletions(-)
Approvals:
Daniel Carvalho: Looks good to me, approved
Jason Lowe-Power: Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/base/debug.test.cc b/src/base/debug.test.cc
index 69ac095..b0f3a5d 100644
--- a/src/base/debug.test.cc
+++ b/src/base/debug.test.cc
@@ -84,13 +84,13 @@
flag.enable();
ASSERT_FALSE(flag.tracing());
Debug::Flag::globalEnable();
-ASSERT_TRUE(flag.tracing());
+ASSERT_TRUE(!TRACING_ON || flag.tracing());
// Verify that the global enabler works
Debug::Flag::globalDisable();
ASSERT_FALSE(flag.tracing());
Debug::Flag::globalEnable();
-ASSERT_TRUE(flag.tracing());
+ASSERT_TRUE(!TRACING_ON || flag.tracing());
// Test disabling the flag with global enabled
flag.disable();
@@ -119,10 +119,10 @@
ASSERT_FALSE(flag.tracing());
Debug::Flag::globalEnable();
for (auto &kid : flag.kids()) {
-ASSERT_TRUE(kid->tracing());
+ASSERT_TRUE(!TRACING_ON || kid->tracing());
}
-ASSERT_TRUE(flag_a.tracing());
-ASSERT_TRUE(flag_b.tracing());
+ASSERT_TRUE(!TRACING_ON || flag_a.tracing());
+ASSERT_TRUE(!TRACING_ON || flag_b.tracing());
// Test disabling the flag with global enabled
flag.disable();
@@ -163,22 +163,22 @@
ASSERT_FALSE(flag_b.tracing());
ASSERT_FALSE(flag.tracing());
flag_a.enable();
-ASSERT_TRUE(flag_a.tracing());
+ASSERT_TRUE(!TRACING_ON || flag_a.tracing());
ASSERT_FALSE(flag_b.tracing());
ASSERT_FALSE(flag.tracing());
// Test that enabling both flags enables the compound flag
-ASSERT_TRUE(flag_a.tracing());
+ASSERT_TRUE(!TRACING_ON || flag_a.tracing());
ASSERT_FALSE(flag_b.tracing());
ASSERT_FALSE(flag.tracing());
flag_b.enable();
-ASSERT_TRUE(flag_a.tracing());
-ASSERT_TRUE(flag_b.tracing());
+ASSERT_TRUE(!TRACING_ON || flag_a.tracing());
+ASSERT_TRUE(!TRACING_ON || flag_b.tracing());
// Test that disabling one of the flags disables the compound flag
flag_a.disable();
ASSERT_FALSE(flag_a.tracing());
-ASSERT_TRUE(flag_b.tracing());
+ASSERT_TRUE(!TRACING_ON || flag_b.tracing());
ASSERT_FALSE(flag.tracing());
}
@@ -195,11 +195,11 @@
EXPECT_TRUE(flag = Debug::findFlag("FlagFindFlagTestA"));
ASSERT_FALSE(flag_a.tracing());
flag->enable();
-ASSERT_TRUE(flag_a.tracing());
+ASSERT_TRUE(!TRACING_ON || flag_a.tracing());
EXPECT_TRUE(flag = Debug::findFlag("FlagFindFlagTestB"));
ASSERT_FALSE(flag_b.tracing());
flag->enable();
-ASSERT_TRUE(flag_b.tracing());
+ASSERT_TRUE(!TRACING_ON || flag_b.tracing());
// Search for a non-existent flag
EXPECT_FALSE(Debug::findFlag("FlagFindFlagTestC"));
@@ -216,7 +216,7 @@
// enabled too
ASSERT_FALSE(flag_a.tracing());
EXPECT_TRUE(Debug::changeFlag("FlagChangeFlagTestA", true));
-ASSERT_TRUE(flag_a.tracing());
+ASSERT_TRUE(!TRACING_ON || flag_a.tracing());
EXPECT_TRUE(Debug::changeFlag("FlagChangeFlagTestA", false));
ASSERT_FALSE(flag_a.tracing());
@@ -225,7 +225,7 @@
EXPECT_TRUE(Debug::changeFlag("FlagChangeFlagTestB", false));
ASSERT_FALSE(flag_b.tracing());
EXPECT_TRUE(Debug::changeFlag("FlagChangeFlagTestB", true));
-ASSERT_TRUE(flag_b.tracing());
+ASSERT_TRUE(!TRACING_ON || flag_b.tracing());
// Change a non-existent flag
ASSERT_FALSE(Debug::changeFlag("FlagChangeFlagTestC", true));
@@ -241,7 +241,7 @@
// Enable and disable a flag
ASSERT_FALSE(flag_a.tracing());
setDebugFlag("FlagSetClearDebugFlagTestA");
-ASSERT_TRUE(flag_a.tracing());
+ASSERT_TRUE(!TRACING_ON || flag_a.tracing());
clearDebugFlag("FlagSetClearDebugFlagTestA");
ASSERT_FALSE(flag_a.tracing());
@@ -250,7 +250,7 @@
clearDebugFlag("FlagSetClearDebugFlagTestB");
ASSERT_FALSE(flag_b.tracing());
setDebugFlag("FlagSetClearDebugFlagTestB");
-ASSERT_TRUE(flag_b.tracing());
+ASSERT_TRUE(!TRACING_ON || flag_b.tracing());
// Change a non-existent flag
setDebugFlag("FlagSetClearDebugFlagTestC");
@@ -295,10 +295,12 @
[gem5-dev] Change in gem5/gem5[minor-release-staging-v21-0-1]: python,misc: Fix develop resources URL to v21-0
Bobby R. Bruce has submitted this change. ( https://gem5-review.googlesource.com/c/public/gem5/+/44725 ) Change subject: python,misc: Fix develop resources URL to v21-0 .. python,misc: Fix develop resources URL to v21-0 This was incorrectly kept as `http://dist.gem5.org/dist/develop` in the v21.0.0 release of gem5. The `dist/develop` directory is used by the develop branch, not by gem5 releases. This change updates the URL to point towards the currect v21-0 branch, which will remain stable and contain resoruces always compatible with the v21-0 release. Change-Id: I5d9a9497cebffa91f08be253f1637e11e0d5e62c Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/44725 Reviewed-by: Jason Lowe-Power Maintainer: Jason Lowe-Power Tested-by: kokoro --- M ext/testlib/configuration.py 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/ext/testlib/configuration.py b/ext/testlib/configuration.py index 1fffab4..18bebdd 100644 --- a/ext/testlib/configuration.py +++ b/ext/testlib/configuration.py @@ -213,7 +213,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/v21-0' defaults.resource_path = os.path.abspath(os.path.join(defaults.base_dir, 'tests', 'gem5', -- To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/44725 To unsubscribe, or for help writing mail filters, visit https://gem5-review.googlesource.com/settings Gerrit-Project: public/gem5 Gerrit-Branch: minor-release-staging-v21-0-1 Gerrit-Change-Id: I5d9a9497cebffa91f08be253f1637e11e0d5e62c Gerrit-Change-Number: 44725 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[minor-release-staging-v21-0-1]: sim: Fix Temperature class
Bobby R. Bruce has submitted this change. ( https://gem5-review.googlesource.com/c/public/gem5/+/44745 ) Change subject: sim: Fix Temperature class .. sim: Fix Temperature class * Adding __str__ method: To fix its printing on config.ini (Replacing with the Temperature value) * Replacing "fromKelvin" with from_kelvin (that's how pybind exports it) * Fixing config_value to allow JSON serialization (JIRA: https://gem5.atlassian.net/browse/GEM5-951) Change-Id: I1aaea9c9df6466a5cbed0a29c5937243796948d2 Signed-off-by: Giacomo Travaglini Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/44167 Reviewed-by: Andreas Sandberg Reviewed-by: Jason Lowe-Power Maintainer: Andreas Sandberg Tested-by: kokoro (cherry picked from commit 6cb9c3e87fa8034122310613079ae4f058f93233) Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/44745 Maintainer: Jason Lowe-Power --- M src/python/m5/params.py 1 file changed, 5 insertions(+), 2 deletions(-) Approvals: Jason Lowe-Power: Looks good to me, approved; Looks good to me, approved kokoro: Regressions pass diff --git a/src/python/m5/params.py b/src/python/m5/params.py index d2366f6..78be6f6 100644 --- a/src/python/m5/params.py +++ b/src/python/m5/params.py @@ -1705,12 +1705,15 @@ self.__init__(value) return value +def __str__(self): +return str(self.value) + def getValue(self): from _m5.core import Temperature -return Temperature.fromKelvin(self.value) +return Temperature.from_kelvin(self.value) def config_value(self): -return self +return self.value @classmethod def cxx_predecls(cls, code): -- To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/44745 To unsubscribe, or for help writing mail filters, visit https://gem5-review.googlesource.com/settings Gerrit-Project: public/gem5 Gerrit-Branch: minor-release-staging-v21-0-1 Gerrit-Change-Id: I1aaea9c9df6466a5cbed0a29c5937243796948d2 Gerrit-Change-Number: 44745 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-CC: Giacomo Travaglini 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: Add GEM5_DEPRECATED_ENUM_VAL
Bobby R. Bruce has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/45539 )
Change subject: base: Add GEM5_DEPRECATED_ENUM_VAL
..
base: Add GEM5_DEPRECATED_ENUM_VAL
This deperecation enum works exactly the same way as GEM5_DEPRECATED
but will not expand if using GCC <6, as enum value deprecation was only
introduced in GCC 6.
Change-Id: I64fcaca0d79a353da805642e021ec1cb101cfa0e
---
M src/base/compiler.hh
M src/sim/aux_vector.hh
2 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/src/base/compiler.hh b/src/base/compiler.hh
index 4ea0dbb..58e5a6f 100644
--- a/src/base/compiler.hh
+++ b/src/base/compiler.hh
@@ -116,6 +116,16 @@
// Mark a c++ declaration as deprecated, with a message explaining what to
do
// to update to a non-deprecated alternative.
# define GEM5_DEPRECATED(message) [[gnu::deprecated(message)]]
+// Mark a C++ emum value as deprecated, with a message explaining what to
do
+// to update to a non-deprecated alternative. This wraps GEM5_DEPRECATED
but
+// is guarded by a preprocessor if directive to ensure it is not included
+// when compiled in GCC < 6, as deprecation of enum values was introduced
in
+// GCC 6.
+# if __GNUC__ < 6
+#define GEM5_DEPRECATED_ENUM_VAL(message)
+# else
+#define GEM5_DEPRECATED_ENUM_VAL(message) GEM5_DEPRECATED(message)
+# endif
// Mark an expression-like macro as deprecated by wrapping it in some code
// which declares and uses a deprecated variable with the same name as the
// macro. The wrapping macro evaluates to the same thing as the original
macro.
diff --git a/src/sim/aux_vector.hh b/src/sim/aux_vector.hh
index 55a4a05..30b 100644
--- a/src/sim/aux_vector.hh
+++ b/src/sim/aux_vector.hh
@@ -98,8 +98,8 @@
} // namespace gem5
#define GEM5_DEPRECATE_AT(NAME, name) M5_AT_##NAME \
-GEM5_DEPRECATED("Replace M5_AT_" #NAME " with gem5::auxv::" #name) = \
-gem5::auxv::name
+GEM5_DEPRECATED_ENUM_VAL(\
+"Replace M5_AT_" #NAME " with gem5::auxv::" #name) =
gem5::auxv::name
enum AuxiliaryVectorType
{
@@ -122,7 +122,7 @@
GEM5_DEPRECATE_AT(HWCAP, Hwcap),
GEM5_DEPRECATE_AT(CLKTCK, Clktck),
GEM5_DEPRECATE_AT(SECURE, Secure),
-M5_BASE_PLATFORM GEM5_DEPRECATED(
+M5_BASE_PLATFORM GEM5_DEPRECATED_ENUM_VAL(
"Replace M5_BASE_PLATFORM with gem5::auxv::BasePlatform") =
gem5::auxv::BasePlatform,
GEM5_DEPRECATE_AT(RANDOM, Random),
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/45539
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: I64fcaca0d79a353da805642e021ec1cb101cfa0e
Gerrit-Change-Number: 45539
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
