[gem5-dev] Change in gem5/gem5[develop]: tests: Revert "Add sleep and debug to the jenkins ..."

2021-06-03 Thread Bobby R. Bruce (Gerrit) via gem5-dev 
Bobby R. Bruce has uploaded this change for review. (  
https://gem5-review.googlesource.com/c/public/gem5/+/46419 )



Change subject: tests: Revert "Add sleep and debug to the jenkins ..."
..

tests: Revert "Add sleep and debug to the jenkins ..."

This reverts
https://gem5-review.googlesource.com/c/public/gem5/+/45999.

This patch didn't yield any useful information, nor did the sleep fix
the issue. From communications with Google, the problem is with the
Kokoro service and is currently being fixed.

Change-Id: I301b470e6f8ed5adb2cc3c0a81590ae804ef750d
---
M tests/jenkins/presubmit.sh
1 file changed, 0 insertions(+), 9 deletions(-)



diff --git a/tests/jenkins/presubmit.sh b/tests/jenkins/presubmit.sh
index e7274ee..5dc5016 100755
--- a/tests/jenkins/presubmit.sh
+++ b/tests/jenkins/presubmit.sh
@@ -36,7 +36,6 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 set -e
-set -x

 DOCKER_IMAGE_ALL_DEP=gcr.io/gem5-test/ubuntu-20.04_all-dependencies
 DOCKER_IMAGE_CLANG_COMPILE=gcr.io/gem5-test/clang-version-9
@@ -48,14 +47,6 @@
 sudo ln -s /tmpfs/docker /var/lib/docker
 sudo /etc/init.d/docker start

-# This is a conservative step to ensure the docker service is fully running
-# prior to executing the tests.
-sleep 2
-
-# Pull the docker images we require
-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/+/46419
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: I301b470e6f8ed5adb2cc3c0a81590ae804ef750d
Gerrit-Change-Number: 46419
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,arch-arm: Replaced X86 clang fast build for ARM_MESI_THREE

2021-06-03 Thread Bobby R. Bruce (Gerrit) via gem5-dev 
Bobby R. Bruce has submitted this change. (  
https://gem5-review.googlesource.com/c/public/gem5/+/38315 )


Change subject: tests,arch-arm: Replaced X86 clang fast build for  
ARM_MESI_THREE

..

tests,arch-arm: Replaced X86 clang fast build for ARM_MESI_THREE

Given ARM_MESI_THREE_Level_HTM is a superset of ARM, it is logical to
compile it with clang and with 'fast' compiler optimizations when
checking for errors. This increases our test coverage

Change-Id: I320291cd543e5db8f543edd81facc91f3f52e17b
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/38315
Reviewed-by: Bobby R. Bruce 
Maintainer: Bobby R. Bruce 
Tested-by: kokoro 
---
M tests/jenkins/presubmit.sh
1 file changed, 5 insertions(+), 4 deletions(-)

Approvals:
  Bobby R. Bruce: Looks good to me, approved; Looks good to me, approved
  kokoro: Regressions pass



diff --git a/tests/jenkins/presubmit.sh b/tests/jenkins/presubmit.sh
index 7b59f55..e7274ee 100755
--- a/tests/jenkins/presubmit.sh
+++ b/tests/jenkins/presubmit.sh
@@ -65,10 +65,11 @@

 # DOCKER_IMAGE_ALL_DEP compiles gem5.opt with GCC. We run a compilation of
 # gem5.fast on the Clang compiler to ensure changes are compilable with the
-# clang compiler. Due to the costs of compilation, we only compile X86
-# at this point. Further compiler tests are carried out as part of our  
weekly

-# "Compiler Checks" tests: http://jenkins.gem5.org/job/Compiler-Checks.
+# clang compiler. Due to the costs of compilation, we only compile
+# ARM_MESI_Three_Level_HTM at this point. Further compiler tests are  
carried

+# out as part of our weekly "Compiler Checks" tests:
+# http://jenkins.gem5.org/job/Compiler-Checks.
 rm -rf build
 docker run -u $UID:$GID --volume $(pwd):$(pwd) -w $(pwd) --rm \
 "${DOCKER_IMAGE_CLANG_COMPILE}" /usr/bin/env python3 /usr/bin/scons \
-build/X86/gem5.fast -j4 --no-compress-debug
+build/ARM_MESI_Three_Level_HTM/gem5.fast -j4 --no-compress-debug

--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/38315
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: I320291cd543e5db8f543edd81facc91f3f52e17b
Gerrit-Change-Number: 38315
Gerrit-PatchSet: 8
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: Kyle Roarty 
Gerrit-Reviewer: Matt Sinclair 
Gerrit-Reviewer: Matthew Poremba 
Gerrit-Reviewer: kokoro 
Gerrit-MessageType: merged
___
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s

[gem5-dev] Change in gem5/gem5[develop]: sim: Handle interleaved device memory

2021-06-03 Thread Matthew Poremba (Gerrit) via gem5-dev 
Matthew Poremba has uploaded this change for review. (  
https://gem5-review.googlesource.com/c/public/gem5/+/46381 )



Change subject: sim: Handle interleaved device memory
..

sim: Handle interleaved device memory

Device memories are used for PCI devices which have their own pools of
backing store memory such as amdgpu device. The check for an address
being in device memory previously did not handle multiple interleaved
memory devices with the same address range. Therefore, the device memory
check would fail if the interleaving masks did not match. This updates
the method to iterate through all device memories that handle the
RequestorID and returns true if any of the device memories contain the
packet address.

Change-Id: I9339d39c1cb54a5b9075c4a122c118fe61dc6fdb
---
M src/sim/system.cc
M src/sim/system.hh
2 files changed, 18 insertions(+), 8 deletions(-)



diff --git a/src/sim/system.cc b/src/sim/system.cc
index 90576eb..7860fa0 100644
--- a/src/sim/system.cc
+++ b/src/sim/system.cc
@@ -386,18 +386,28 @@
 bool
 System::isDeviceMemAddr(PacketPtr pkt) const
 {
-const RequestorID& id = pkt->requestorId();
+if (!deviceMemMap.count(pkt->requestorId())) {
+return false;
+}

-return (deviceMemMap.count(id) &&
-deviceMemMap.at(id)->getAddrRange().contains(pkt->getAddr()));
+return (getDeviceMemory(pkt) != nullptr);
 }

 AbstractMemory *
-System::getDeviceMemory(RequestorID id) const
+System::getDeviceMemory(PacketPtr pkt) const
 {
-panic_if(!deviceMemMap.count(id),
- "No device memory found for RequestorID %d\n", id);
-return deviceMemMap.at(id);
+const RequestorID& rid = pkt->requestorId();
+
+panic_if(!deviceMemMap.count(rid),
+ "No device memory found for MasterID %d\n", rid);
+
+for (auto& mem : deviceMemMap.at(rid)) {
+if (pkt->getAddrRange().isSubset(mem->getAddrRange())) {
+return mem;
+}
+}
+
+return nullptr;
 }

 void
diff --git a/src/sim/system.hh b/src/sim/system.hh
index b22d441..a5651bc 100644
--- a/src/sim/system.hh
+++ b/src/sim/system.hh
@@ -376,7 +376,7 @@
 /**
  * Return a pointer to the device memory.
  */
-AbstractMemory *getDeviceMemory(RequestorID _id) const;
+AbstractMemory *getDeviceMemory(PacketPtr pkt) const;

 /*
  * Return the list of address ranges backed by a shadowed ROM.

--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/46381
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: I9339d39c1cb54a5b9075c4a122c118fe61dc6fdb
Gerrit-Change-Number: 46381
Gerrit-PatchSet: 1
Gerrit-Owner: Matthew Poremba 
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: Fix include of pybind

2021-06-03 Thread Daniel Carvalho (Gerrit) via gem5-dev 
Daniel Carvalho has submitted this change. (  
https://gem5-review.googlesource.com/c/public/gem5/+/46319 )


Change subject: python: Fix include of pybind
..

python: Fix include of pybind

The included file was not the correct one to get
the macro from, but the macro will use the original
file included.

Change-Id: I612f0d0b291cc2da8668c60471b7b78c7967ea5b
Signed-off-by: Daniel R. Carvalho 
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/46319
Reviewed-by: Andreas Sandberg 
Maintainer: Andreas Sandberg 
Tested-by: kokoro 
---
M src/python/pybind11/core.hh
1 file changed, 1 insertion(+), 0 deletions(-)

Approvals:
  Andreas Sandberg: Looks good to me, approved; Looks good to me, approved
  kokoro: Regressions pass



diff --git a/src/python/pybind11/core.hh b/src/python/pybind11/core.hh
index 4fc9cc0..33562e8 100644
--- a/src/python/pybind11/core.hh
+++ b/src/python/pybind11/core.hh
@@ -38,6 +38,7 @@
 #ifndef __PYTHON_PYBIND11_CORE_HH__
 #define __PYTHON_PYBIND11_CORE_HH__

+#include "pybind11/cast.h"
 #include "pybind11/stl_bind.h"

 #include 

--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/46319
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: I612f0d0b291cc2da8668c60471b7b78c7967ea5b
Gerrit-Change-Number: 46319
Gerrit-PatchSet: 2
Gerrit-Owner: Daniel Carvalho 
Gerrit-Reviewer: Andreas Sandberg 
Gerrit-Reviewer: Daniel Carvalho 
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]: systemc: include

2021-06-03 Thread Iru Cai (Gerrit) via gem5-dev 
Iru Cai has uploaded this change for review. (  
https://gem5-review.googlesource.com/c/public/gem5/+/46399 )



Change subject: systemc: include 
..

systemc: include 

GCC 11.1 complains about not finding std::type_info, which is in
header .

Change-Id: I3b4352c8caeac73815f569911f47a7dfbddf23f3
Signed-off-by: Iru Cai 
---
M src/systemc/ext/tlm_utils/instance_specific_extensions_int.h
1 file changed, 1 insertion(+), 0 deletions(-)



diff --git a/src/systemc/ext/tlm_utils/instance_specific_extensions_int.h  
b/src/systemc/ext/tlm_utils/instance_specific_extensions_int.h

index a391091..e7036ac 100644
--- a/src/systemc/ext/tlm_utils/instance_specific_extensions_int.h
+++ b/src/systemc/ext/tlm_utils/instance_specific_extensions_int.h
@@ -19,6 +19,7 @@
 #ifndef __SYSTEMC_EXT_TLM_UTILS_INSTANCE_SPECIFIC_EXTENSIONS_INT_H__
 #define __SYSTEMC_EXT_TLM_UTILS_INSTANCE_SPECIFIC_EXTENSIONS_INT_H__

+#include 
 #include 

 #include "../tlm_core/2/generic_payload/array.hh"

--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/46399
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: I3b4352c8caeac73815f569911f47a7dfbddf23f3
Gerrit-Change-Number: 46399
Gerrit-PatchSet: 1
Gerrit-Owner: Iru Cai 
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] Build failed in Jenkins: compiler-checks #82

2021-06-03 Thread jenkins-no-reply--- via gem5-dev 
See 


Changes:

[yuhsingw] dev-arm: add ArmSigInterruptPin

[yuhsingw] systemc: Set verify.py shebang to python3

[arthurperais] cpu-o3: Prevent a mistarget from sending execution on an 
incorrect path

[hoanguyen] configs: fix se.py error when using "--redirects"


--
Started by timer
Running as SYSTEM
Building in workspace 
Selected Git installation does not exist. Using Default
The recommended git tool is: NONE
No credentials specified
 > git rev-parse --resolve-git-dir 
 >  # timeout=10
Fetching changes from the remote Git repository
 > git config remote.origin.url https://gem5.googlesource.com/public/gem5 # 
 > timeout=10
Fetching upstream changes from https://gem5.googlesource.com/public/gem5
 > git --version # timeout=10
 > git --version # 'git version 2.25.1'
 > git fetch --tags --force --progress -- 
 > https://gem5.googlesource.com/public/gem5 
 > +refs/heads/*:refs/remotes/origin/* # timeout=10
 > git rev-parse refs/remotes/origin/develop^{commit} # timeout=10
Checking out Revision b04bf8f729ddf68b0eeac8646ce902f2b56f9ac5 
(refs/remotes/origin/develop)
 > git config core.sparsecheckout # timeout=10
 > git checkout -f b04bf8f729ddf68b0eeac8646ce902f2b56f9ac5 # timeout=10
Commit message: "configs: fix se.py error when using "--redirects""
 > git rev-list --no-walk efc9a68620d6eaa77d85816159a2fcbcc3d97781 # timeout=10
[compiler-checks] $ /bin/sh -xe /tmp/jenkins4233038227058010936.sh
+ ./util/compiler-tests.sh -j 12
Starting build tests with 'gcc-version-10'...
'gcc-version-10' was found in the comprehensive tests. All ISAs will be built.
  * Building target 'ARM_MESI_Three_Level.opt' with 'gcc-version-10'...
Done.
  * Building target 'ARM_MESI_Three_Level.fast' with 'gcc-version-10'...
Done.
  * Building target 'GCN3_X86.opt' with 'gcc-version-10'...
Done.
  * Building target 'GCN3_X86.fast' with 'gcc-version-10'...
Done.
  * Building target 'RISCV.opt' with 'gcc-version-10'...
Done.
  * Building target 'RISCV.fast' with 'gcc-version-10'...
Done.
  * Building target 'Garnet_standalone.opt' with 'gcc-version-10'...
Done.
  * Building target 'Garnet_standalone.fast' with 'gcc-version-10'...
Done.
  * Building target 'X86_MOESI_AMD_Base.opt' with 'gcc-version-10'...
Done.
  * Building target 'X86_MOESI_AMD_Base.fast' with 'gcc-version-10'...
Done.
  * Building target 'SPARC.opt' with 'gcc-version-10'...
Done.
  * Building target 'SPARC.fast' with 'gcc-version-10'...
Done.
  * Building target 'ARM.opt' with 'gcc-version-10'...
Done.
  * Building target 'ARM.fast' with 'gcc-version-10'...
Done.
  * Building target 'POWER.opt' with 'gcc-version-10'...
Done.
  * Building target 'POWER.fast' with 'gcc-version-10'...
Done.
  * Building target 'NULL_MOESI_CMP_token.opt' with 'gcc-version-10'...
Done.
  * Building target 'NULL_MOESI_CMP_token.fast' with 'gcc-version-10'...
Done.
  * Building target 'NULL_MESI_Two_Level.opt' with 'gcc-version-10'...
Done.
  * Building target 'NULL_MESI_Two_Level.fast' with 'gcc-version-10'...
Done.
  * Building target 'X86.opt' with 'gcc-version-10'...
Done.
  * Building target 'X86.fast' with 'gcc-version-10'...
Done.
  * Building target 'NULL_MOESI_hammer.opt' with 'gcc-version-10'...
Done.
  * Building target 'NULL_MOESI_hammer.fast' with 'gcc-version-10'...
Done.
  * Building target 'MIPS.opt' with 'gcc-version-10'...
Done.
  * Building target 'MIPS.fast' with 'gcc-version-10'...
Done.
  * Building target 'NULL_MOESI_CMP_directory.opt' with 'gcc-version-10'...
Done.
  * Building target 'NULL_MOESI_CMP_directory.fast' with 'gcc-version-10'...
Done.
Starting build tests with 'gcc-version-9'...
  * Building target 'NULL_MOESI_CMP_directory.opt' with 'gcc-version-9'...
Done.
  * Building target 'NULL_MOESI_CMP_directory.fast' with 'gcc-version-9'...
Done.
Starting build tests with 'gcc-version-8'...
  * Building target 'Garnet_standalone.opt' with 'gcc-version-8'...
Done.
  * Building target 'Garnet_standalone.fast' with 'gcc-version-8'...
Done.
Starting build tests with 'gcc-version-7'...
  * Building target 'POWER.opt' with 'gcc-version-7'...
Done.
  * Building target 'POWER.fast' with 'gcc-version-7'...
Done.
Starting build tests with 'gcc-version-6'...
  * Building target 'NULL_MOESI_hammer.opt' with 'gcc-version-6'...
Done.
  * Building target 'NULL_MOESI_hammer.fast' with 'gcc-version-6'...
Done.
Starting build tests with 'gcc-version-5'...
  * Building target 'GCN3_X86.opt' with 'gcc-version-5'...
  ! Failed with exit code 2.
  * Building target 'GCN3_X86.fast' with 'gcc-version-5'...
  ! Failed with exit code 2.
Starting build tests with 'clang-version-11'...
'clang-version-11' was found in the