[gem5-dev] Jenkins build is back to normal : nightly #459

[jenkins-no-reply--- via gem5-dev]

See 
___
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org

[gem5-dev] [S] Change in gem5/gem5[develop]: tests: Fix compiler-tests.sh build args passing

[Jason Lowe-Power (Gerrit) via gem5-dev]

Jason Lowe-Power has submitted this change. (  
https://gem5-review.googlesource.com/c/public/gem5/+/66772?usp=email )


Change subject: tests: Fix compiler-tests.sh build args passing
..

tests: Fix compiler-tests.sh build args passing

Reverts this fix:
https://gem5-review.googlesource.com/c/public/gem5/+/66631

While this did fix the case where no build args were passed, it broke
the case where build args were passed.

This fix ensures the script works in both cases.

Change-Id: I6cc8cc0c2a10c801d4a59e54b070383ac8ee93ae
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/66772
Reviewed-by: Matt Sinclair 
Maintainer: Matt Sinclair 
Maintainer: Bobby Bruce 
Reviewed-by: Jason Lowe-Power 
Tested-by: kokoro 
---
M tests/compiler-tests.sh
1 file changed, 31 insertions(+), 2 deletions(-)

Approvals:
  Matt Sinclair: Looks good to me, approved; Looks good to me, approved
  Bobby Bruce: Looks good to me, approved
  Jason Lowe-Power: Looks good to me, approved
  kokoro: Regressions pass




diff --git a/tests/compiler-tests.sh b/tests/compiler-tests.sh
index f16e8e5..f5d4bb1 100755
--- a/tests/compiler-tests.sh
+++ b/tests/compiler-tests.sh
@@ -76,7 +76,13 @@
 base_url="gcr.io/gem5-test"

 # Arguments passed into scons on every build target test.
-build_args="$@"
+if [ $# -eq 0 ];then
+# If none is sepcified by the user we pass "-j1" (compile on one  
thread).

+# If `build_args` is left as an empty string, this script will fail.
+build_args="-j1"
+else
+build_args="$@"
+fi

 # Testing directory variables
 mkdir -p "${build_dir}" # Create the build directory if it doesn't exist.
@@ -135,7 +141,7 @@
 docker run --rm -v "${gem5_root}":"/gem5" -u $UID:$GID \
 -w /gem5 --memory="${docker_mem_limit}" $repo_name \
 /usr/bin/env python3 /usr/bin/scons --ignore-style \
-"${build_out} ${build_args}"
+"${build_out}" "${build_args}"
 }>"${build_stdout}" 2>"${build_stderr}"
 result=$?


--
To view, visit  
https://gem5-review.googlesource.com/c/public/gem5/+/66772?usp=email
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: I6cc8cc0c2a10c801d4a59e54b070383ac8ee93ae
Gerrit-Change-Number: 66772
Gerrit-PatchSet: 3
Gerrit-Owner: Bobby Bruce 
Gerrit-Reviewer: Bobby 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

[gem5-dev] [S] Change in gem5/gem5[release-staging-v22-1]: tests: Remove get_runtime_isa() from parsec_disk_run.py

[Bobby Bruce (Gerrit) via gem5-dev]

Bobby Bruce has submitted this change. (  
https://gem5-review.googlesource.com/c/public/gem5/+/66611?usp=email )


Change subject: tests: Remove get_runtime_isa() from parsec_disk_run.py
..

tests: Remove get_runtime_isa() from parsec_disk_run.py

This change removes the call to get_runtime_isa(), as it has
been deprecated.

Change-Id: Ie1b0b5fb456fd8ed504a531841fe4ea8e211502c
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/66611
Maintainer: Boris Shingarov 
Maintainer: Bobby Bruce 
Reviewed-by: Boris Shingarov 
Tested-by: kokoro 
---
M tests/gem5/configs/parsec_disk_run.py
1 file changed, 17 insertions(+), 5 deletions(-)

Approvals:
  Boris Shingarov: Looks good to me, approved; Looks good to me, approved
  kokoro: Regressions pass
  Bobby Bruce: Looks good to me, approved




diff --git a/tests/gem5/configs/parsec_disk_run.py  
b/tests/gem5/configs/parsec_disk_run.py

index 4275ffb..fbe1cd3 100644
--- a/tests/gem5/configs/parsec_disk_run.py
+++ b/tests/gem5/configs/parsec_disk_run.py
@@ -214,11 +214,6 @@
 readfile_contents=command,
 )

-print("Running with ISA: " + get_runtime_isa().name)
-print("Running with protocol: " + get_runtime_coherence_protocol().name)
-print()
-
-
 # Here we define some custom workbegin/workend exit event generators. Here  
we
 # want to switch to detailed CPUs at the beginning of the ROI, then  
continue to

 # the end of of the ROI. Then we exit the simulation.

--
To view, visit  
https://gem5-review.googlesource.com/c/public/gem5/+/66611?usp=email
To unsubscribe, or for help writing mail filters, visit  
https://gem5-review.googlesource.com/settings


Gerrit-Project: public/gem5
Gerrit-Branch: release-staging-v22-1
Gerrit-Change-Id: Ie1b0b5fb456fd8ed504a531841fe4ea8e211502c
Gerrit-Change-Number: 66611
Gerrit-PatchSet: 3
Gerrit-Owner: Melissa Jost 
Gerrit-Reviewer: Bobby Bruce 
Gerrit-Reviewer: Boris Shingarov 
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

[gem5-dev] [S] Change in gem5/gem5[develop]: tests: Remove get_runtime_isa() from parsec_disk_run.py

[Bobby Bruce (Gerrit) via gem5-dev]

Bobby Bruce has submitted this change. (  
https://gem5-review.googlesource.com/c/public/gem5/+/66612?usp=email )


Change subject: tests: Remove get_runtime_isa() from parsec_disk_run.py
..

tests: Remove get_runtime_isa() from parsec_disk_run.py

This change removes the call to get_runtime_isa(), as it has
been deprecated.

Change-Id: Ie1b0b5fb456fd8ed504a531841fe4ea8e211502c
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/66612
Tested-by: kokoro 
Reviewed-by: Jason Lowe-Power 
Maintainer: Bobby Bruce 
---
M tests/gem5/configs/parsec_disk_run.py
1 file changed, 16 insertions(+), 5 deletions(-)

Approvals:
  kokoro: Regressions pass
  Jason Lowe-Power: Looks good to me, approved
  Bobby Bruce: Looks good to me, approved




diff --git a/tests/gem5/configs/parsec_disk_run.py  
b/tests/gem5/configs/parsec_disk_run.py

index 4275ffb..fbe1cd3 100644
--- a/tests/gem5/configs/parsec_disk_run.py
+++ b/tests/gem5/configs/parsec_disk_run.py
@@ -214,11 +214,6 @@
 readfile_contents=command,
 )

-print("Running with ISA: " + get_runtime_isa().name)
-print("Running with protocol: " + get_runtime_coherence_protocol().name)
-print()
-
-
 # Here we define some custom workbegin/workend exit event generators. Here  
we
 # want to switch to detailed CPUs at the beginning of the ROI, then  
continue to

 # the end of of the ROI. Then we exit the simulation.

--
To view, visit  
https://gem5-review.googlesource.com/c/public/gem5/+/66612?usp=email
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: Ie1b0b5fb456fd8ed504a531841fe4ea8e211502c
Gerrit-Change-Number: 66612
Gerrit-PatchSet: 4
Gerrit-Owner: Bobby Bruce 
Gerrit-Reviewer: Bobby Bruce 
Gerrit-Reviewer: Jason Lowe-Power 
Gerrit-Reviewer: kokoro 
Gerrit-CC: Melissa Jost 
Gerrit-MessageType: merged
___
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org

[gem5-dev] Re: Build failed in Jenkins: compiler-checks #457

[Bobby Bruce via gem5-dev]

This one is my fault. This should fix the problem:
https://gem5-review.googlesource.com/c/public/gem5/+/66772

--
Dr. Bobby R. Bruce
Room 3050,
Kemper Hall, UC Davis
Davis,
CA, 95616

web: https://www.bobbybruce.net


On Sat, Dec 17, 2022 at 4:53 AM jenkins-no-reply--- via gem5-dev <
gem5-dev@gem5.org> wrote:

> See <
> https://jenkins.gem5.org/job/compiler-checks/457/display/redirect?page=changes
> >
>
> Changes:
>
> [gabe.black] dev: Introduce a reset() method on RegisterBank and Register
> classes.
>
> [gabe.black] dev: Implement a "Signal" port which has a templated State
> type.
>
> [gabe.black] fastmodel,dev: Rework the Int*Pin classes with Signal*Port.
>
> [gabe.black] fastmodel: Change the Signal proxies to use Signal*Port.
>
> [gabe.black] fastmodel,dev: Replace the reset port with a
> Signal*Port.
>
> [matthew.poremba] gpu-compute: Fix ABI init for DispatchId
>
>
> --
> [...truncated 1.03 KB...]
>  > git checkout -f af2cecf59e9cffbbc96bb88b9137da8ef6c74410 # timeout=10
> Commit message: "gpu-compute: Fix ABI init for DispatchId"
>  > git rev-list --no-walk f96513fd042c3a1843eb4a3131d08b0fe0aa947f #
> timeout=10
> [Checks API] No suitable checks publisher found.
> [compiler-checks] $ /bin/sh -xe /tmp/jenkins10486267684618008562.sh
> + ./tests/compiler-tests.sh -j 16
> Starting build tests with 'gcc-version-12'...
> 'gcc-version-12' was found in the comprehensive tests. All ISAs will be
> built.
>   * Building target 'ARM.opt' with 'gcc-version-12'...
>   ! Failed with exit code 2.
>   * Building target 'ARM.fast' with 'gcc-version-12'...
>   ! Failed with exit code 2.
>   * Building target 'NULL_MOESI_hammer.opt' with 'gcc-version-12'...
>   ! Failed with exit code 2.
>   * Building target 'NULL_MOESI_hammer.fast' with 'gcc-version-12'...
>   ! Failed with exit code 2.
>   * Building target 'X86.opt' with 'gcc-version-12'...
>   ! Failed with exit code 2.
>   * Building target 'X86.fast' with 'gcc-version-12'...
>   ! Failed with exit code 2.
>   * Building target 'X86_MI_example.opt' with 'gcc-version-12'...
>   ! Failed with exit code 2.
>   * Building target 'X86_MI_example.fast' with 'gcc-version-12'...
>   ! Failed with exit code 2.
>   * Building target 'RISCV.opt' with 'gcc-version-12'...
>   ! Failed with exit code 2.
>   * Building target 'RISCV.fast' with 'gcc-version-12'...
>   ! Failed with exit code 2.
>   * Building target 'GCN3_X86.opt' with 'gcc-version-12'...
>   ! Failed with exit code 2.
>   * Building target 'GCN3_X86.fast' with 'gcc-version-12'...
>   ! Failed with exit code 2.
>   * Building target 'NULL_MESI_Two_Level.opt' with 'gcc-version-12'...
>   ! Failed with exit code 2.
>   * Building target 'NULL_MESI_Two_Level.fast' with 'gcc-version-12'...
>   ! Failed with exit code 2.
>   * Building target 'Garnet_standalone.opt' with 'gcc-version-12'...
>   ! Failed with exit code 2.
>   * Building target 'Garnet_standalone.fast' with 'gcc-version-12'...
>   ! Failed with exit code 2.
>   * Building target 'POWER.opt' with 'gcc-version-12'...
>   ! Failed with exit code 2.
>   * Building target 'POWER.fast' with 'gcc-version-12'...
>   ! Failed with exit code 2.
>   * Building target 'ALL.opt' with 'gcc-version-12'...
>   ! Failed with exit code 2.
>   * Building target 'ALL.fast' with 'gcc-version-12'...
>   ! Failed with exit code 2.
>   * Building target 'ARM_MOESI_hammer.opt' with 'gcc-version-12'...
>   ! Failed with exit code 2.
>   * Building target 'ARM_MOESI_hammer.fast' with 'gcc-version-12'...
>   ! Failed with exit code 2.
>   * Building target 'NULL_MOESI_CMP_token.opt' with 'gcc-version-12'...
>   ! Failed with exit code 2.
>   * Building target 'NULL_MOESI_CMP_token.fast' with 'gcc-version-12'...
>   ! Failed with exit code 2.
>   * Building target 'SPARC.opt' with 'gcc-version-12'...
>   ! Failed with exit code 2.
>   * Building target 'SPARC.fast' with 'gcc-version-12'...
>   ! Failed with exit code 2.
>   * Building target 'ARM_MESI_Three_Level.opt' with 'gcc-version-12'...
>   ! Failed with exit code 2.
>   * Building target 'ARM_MESI_Three_Level.fast' with 'gcc-version-12'...
>   ! Failed with exit code 2.
>   * Building target 'MIPS.opt' with 'gcc-version-12'...
>   ! Failed with exit code 2.
>   * Building target 'MIPS.fast' with 'gcc-version-12'...
>   ! Failed with exit code 2.
>   * Building target 'NULL_MOESI_CMP_directory.opt' with 'gcc-version-12'...
>   ! Failed with exit code 2.
>   * Building target 'NULL_MOESI_CMP_directory.fast' with
> 'gcc-version-12'...
>   ! Failed with exit code 2.
>   * Building target 'ARM_MESI_Three_Level_HTM.opt' with 'gcc-version-12'...
>   ! Failed with exit code 2.
>   * Building target 'ARM_MESI_Three_Level_HTM.fast' with
> 'gcc-version-12'...
>   ! Failed with exit code 2.
>   * Building target 'NULL.opt' with 'gcc-version-12'...
>   ! Failed with exit code 2.
>   * Building target 'NULL.fast' with 'gcc-version-12'...
>   ! Failed with exit code 2.
>   * Building target 

[gem5-dev] [S] Change in gem5/gem5[develop]: tests: Fix compiler-tests.sh build args passing

[Bobby Bruce (Gerrit) via gem5-dev]

Bobby Bruce has uploaded this change for review. (  
https://gem5-review.googlesource.com/c/public/gem5/+/66772?usp=email )



Change subject: tests: Fix compiler-tests.sh build args passing
..

tests: Fix compiler-tests.sh build args passing

Reverts this fix:
https://gem5-review.googlesource.com/c/public/gem5/+/66631

While this did fix the case where no build args were passed, it broke
the case where build args were passed.

This fix ensures the script works in both cases.

Change-Id: I6cc8cc0c2a10c801d4a59e54b070383ac8ee93ae
---
M tests/compiler-tests.sh
1 file changed, 26 insertions(+), 2 deletions(-)



diff --git a/tests/compiler-tests.sh b/tests/compiler-tests.sh
index f16e8e5..824bc9b 100755
--- a/tests/compiler-tests.sh
+++ b/tests/compiler-tests.sh
@@ -75,8 +75,15 @@
 # Base URL of the gem5 testing images.
 base_url="gcr.io/gem5-test"

+
 # Arguments passed into scons on every build target test.
-build_args="$@"
+if [ $# -eq 0 ];then
+# If none is sepcified by the user we pass "-j1" (compile on one  
thread).

+# If `build_args` is left as an empty string, this script will fail.
+build_args="-j1"
+else
+build_args="$@"
+fi

 # Testing directory variables
 mkdir -p "${build_dir}" # Create the build directory if it doesn't exist.
@@ -135,7 +142,7 @@
 docker run --rm -v "${gem5_root}":"/gem5" -u $UID:$GID \
 -w /gem5 --memory="${docker_mem_limit}" $repo_name \
 /usr/bin/env python3 /usr/bin/scons --ignore-style \
-"${build_out} ${build_args}"
+"${build_out}" "${build_args}"
 }>"${build_stdout}" 2>"${build_stderr}"
 result=$?


--
To view, visit  
https://gem5-review.googlesource.com/c/public/gem5/+/66772?usp=email
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: I6cc8cc0c2a10c801d4a59e54b070383ac8ee93ae
Gerrit-Change-Number: 66772
Gerrit-PatchSet: 1
Gerrit-Owner: Bobby Bruce 
Gerrit-MessageType: newchange
___
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org

[gem5-dev] [M] Change in gem5/gem5[develop]: stdlib: Fix errors in MESI_Three_Level_Cache_Hierarchy

[Hoa Nguyen (Gerrit) via gem5-dev]

Hoa Nguyen has uploaded this change for review. (  
https://gem5-review.googlesource.com/c/public/gem5/+/66771?usp=email )



Change subject: stdlib: Fix errors in MESI_Three_Level_Cache_Hierarchy
..

stdlib: Fix errors in MESI_Three_Level_Cache_Hierarchy

Change-Id: I60ae47f4336cb1b54bcca3fce3bdd13858daa92a
Signed-off-by: Hoa Nguyen 
---
M  
src/python/gem5/components/cachehierarchies/ruby/caches/mesi_three_level/dma_controller.py
M  
src/python/gem5/components/cachehierarchies/ruby/caches/mesi_three_level/l1_cache.py
M  
src/python/gem5/components/cachehierarchies/ruby/caches/mesi_three_level/l2_cache.py
M  
src/python/gem5/components/cachehierarchies/ruby/caches/mesi_three_level/l3_cache.py

4 files changed, 31 insertions(+), 19 deletions(-)



diff --git  
a/src/python/gem5/components/cachehierarchies/ruby/caches/mesi_three_level/dma_controller.py  
b/src/python/gem5/components/cachehierarchies/ruby/caches/mesi_three_level/dma_controller.py

index ab76d4c..f731869 100644
---  
a/src/python/gem5/components/cachehierarchies/ruby/caches/mesi_three_level/dma_controller.py
+++  
b/src/python/gem5/components/cachehierarchies/ruby/caches/mesi_three_level/dma_controller.py

@@ -25,16 +25,26 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 from ..utils.override import overrides
-from ..abstract_dma_controller import AbstractDMAController

-from m5.objects import MessageBuffer
+from m5.objects import MessageBuffer, DMA_Controller


-class DMAController(AbstractDMAController):
-def __init__(self, network, cache_line_size):
-super().__init__(network, cache_line_size)
+class DMAController(DMA_Controller):
+_version = 0

-@overrides(AbstractDMAController)
+@classmethod
+def _get_version(cls):
+cls._version += 1
+return cls._version - 1
+
+def __init__(self, dma_sequencer, ruby_system):
+super().__init__(
+version=self._get_version(),
+dma_sequencer=dma_sequencer,
+ruby_system=ruby_system,
+)
+self.connectQueues(self.ruby_system.network)
+
 def connectQueues(self, network):
 self.mandatoryQueue = MessageBuffer()
 self.responseFromDir = MessageBuffer(ordered=True)
diff --git  
a/src/python/gem5/components/cachehierarchies/ruby/caches/mesi_three_level/l1_cache.py  
b/src/python/gem5/components/cachehierarchies/ruby/caches/mesi_three_level/l1_cache.py

index 2ce13d3..9d68550 100644
---  
a/src/python/gem5/components/cachehierarchies/ruby/caches/mesi_three_level/l1_cache.py
+++  
b/src/python/gem5/components/cachehierarchies/ruby/caches/mesi_three_level/l1_cache.py

@@ -68,14 +68,14 @@
 self.Icache = RubyCache(
 size=l1i_size,
 assoc=l1i_assoc,
-start_index_bit=self.getBlockSizeBits(),
+start_index_bit=int(math.log(cache_line_size, 2)),
 is_icache=True,
 replacement_policy=LRURP(),
 )
 self.Dcache = RubyCache(
 size=l1d_size,
 assoc=l1d_assoc,
-start_index_bit=self.getBlockSizeBits(),
+start_index_bit=int(math.log(cache_line_size, 2)),
 is_icache=False,
 replacement_policy=LRURP(),
 )
@@ -88,15 +88,8 @@
 self.response_latency = 2

 self.version = self.versionCount()
-self._cache_line_size = cache_line_size
 self.connectQueues(network)

-def getBlockSizeBits(self):
-bits = int(math.log(self._cache_line_size, 2))
-if 2**bits != self._cache_line_size.value:
-raise Exception("Cache line size is not a power of 2!")
-return bits
-
 def connectQueues(self, network):
 self.prefetchQueue = MessageBuffer()
 self.mandatoryQueue = MessageBuffer()
diff --git  
a/src/python/gem5/components/cachehierarchies/ruby/caches/mesi_three_level/l2_cache.py  
b/src/python/gem5/components/cachehierarchies/ruby/caches/mesi_three_level/l2_cache.py

index e29f566..e9f7270 100644
---  
a/src/python/gem5/components/cachehierarchies/ruby/caches/mesi_three_level/l2_cache.py
+++  
b/src/python/gem5/components/cachehierarchies/ruby/caches/mesi_three_level/l2_cache.py

@@ -67,7 +67,7 @@
 self.cache = RubyCache(
 size=l2_size,
 assoc=l2_assoc,
-start_index_bit=self.getBlockSizeBits(),
+start_index_bit=int(math.log(cache_line_size, 2)),
 is_icache=False,
 )
 # l2_select_num_bits is ruby backend terminology.
@@ -86,7 +86,6 @@
 self.to_l2_latency = 1

 self.version = self.versionCount()
-self._cache_line_size = cache_line_size
 self.connectQueues(network)

 def connectQueues(self, network):
diff --git  
a/src/python/gem5/components/cachehierarchies/ruby/caches/mesi_three_level/l3_cache.py