[gem5-dev] [M] Change in gem5/gem5[develop]: stdlib, configs: Add example SE mode script for RISCV matched

2022-09-22 Thread Jasjeet Rangi (Gerrit)
Jasjeet Rangi has submitted this change. (  
https://gem5-review.googlesource.com/c/public/gem5/+/63571?usp=email )


Change subject: stdlib, configs: Add example SE mode script for RISCV  
matched

..

stdlib, configs: Add example SE mode script for RISCV matched

This script runs the riscv-hello binary from gem5 resources on the
RISCV matched prebuilt board found in the
src/python/gem5/prebuilt/riscvmatched/ directory.

Change-Id: I1b527588b0319e9ab853dfcbfa381db2137d1a98
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/63571
Maintainer: Bobby Bruce 
Tested-by: kokoro 
Reviewed-by: Bobby Bruce 
---
A configs/example/gem5_library/riscvmatched-hello.py
1 file changed, 82 insertions(+), 0 deletions(-)

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




diff --git a/configs/example/gem5_library/riscvmatched-hello.py  
b/configs/example/gem5_library/riscvmatched-hello.py

new file mode 100644
index 000..d8ae8e5
--- /dev/null
+++ b/configs/example/gem5_library/riscvmatched-hello.py
@@ -0,0 +1,65 @@
+# Copyright (c) 2022 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.
+"""
+This gem5 configuation script runs a "hello world" binary on the
+RISCVMatched prebuilt board found in src/python/gem5/prebuilt/riscvmatched/
+
+Usage
+-
+
+```
+scons build/RISCV/gem5.opt
+./build/RISCV/gem5.opt \
+configs/example/gem5_library/riscvmatched-hello.py
+```
+"""
+
+from gem5.resources.resource import Resource
+from gem5.simulate.simulator import Simulator
+from python.gem5.prebuilt.riscvmatched.riscvmatched_board import (
+RISCVMatchedBoard,
+)
+from gem5.isas import ISA
+from gem5.utils.requires import requires
+
+requires(isa_required=ISA.RISCV)
+
+# instantiate the riscv matched board with default parameters
+board = RISCVMatchedBoard()
+
+# set the hello world riscv binary as the board workload
+board.set_se_binary_workload(Resource("riscv-hello"))
+
+# run the simulation with the RISCV Matched board
+simulator = Simulator(board=board, full_system=False)
+simulator.run()
+
+print(
+"Exiting @ tick {} because {}.".format(
+simulator.get_current_tick(),
+simulator.get_last_exit_event_cause(),
+)
+)

--
To view, visit  
https://gem5-review.googlesource.com/c/public/gem5/+/63571?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: I1b527588b0319e9ab853dfcbfa381db2137d1a98
Gerrit-Change-Number: 63571
Gerrit-PatchSet: 10
Gerrit-Owner: Jasjeet Rangi 
Gerrit-Reviewer: Bobby Bruce 
Gerrit-Reviewer: Jasjeet Rangi 
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]: configs: bug fix for misc node distribution

2022-09-22 Thread Daecheol You (Gerrit)
Daecheol You has submitted this change. (  
https://gem5-review.googlesource.com/c/public/gem5/+/63731?usp=email )


Change subject: configs: bug fix for misc node distribution
..

configs: bug fix for misc node distribution

Wrong parameter is removed from the distributeNodes calling

Change-Id: I84cdf3e993d6b7852c4f134441d77a4b295e8574
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/63731
Maintainer: Jason Lowe-Power 
Tested-by: kokoro 
Reviewed-by: Jason Lowe-Power 
Reviewed-by: Tiago Muck 
---
M configs/topologies/CustomMesh.py
1 file changed, 17 insertions(+), 1 deletion(-)

Approvals:
  Tiago Muck: Looks good to me, approved
  Jason Lowe-Power: Looks good to me, approved; Looks good to me, approved
  kokoro: Regressions pass




diff --git a/configs/topologies/CustomMesh.py  
b/configs/topologies/CustomMesh.py

index 2e10fdc..545ba4b 100644
--- a/configs/topologies/CustomMesh.py
+++ b/configs/topologies/CustomMesh.py
@@ -357,7 +357,7 @@
 self.distributeNodes(hnf_params, hnf_nodes)

 # Place CHI_MN on the mesh
-self.distributeNodes(options, mn_params, mn_nodes)
+self.distributeNodes(mn_params, mn_nodes)

 # Place CHI_SNF_MainMem on the mesh
 self.distributeNodes(mem_params, mem_nodes)

--
To view, visit  
https://gem5-review.googlesource.com/c/public/gem5/+/63731?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: I84cdf3e993d6b7852c4f134441d77a4b295e8574
Gerrit-Change-Number: 63731
Gerrit-PatchSet: 2
Gerrit-Owner: Daecheol You 
Gerrit-Reviewer: Daecheol You 
Gerrit-Reviewer: Jason Lowe-Power 
Gerrit-Reviewer: Jason Lowe-Power 
Gerrit-Reviewer: Tiago Muck 
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]: configs: fix CHI config for Garnet

2022-09-22 Thread Tiago Muck (Gerrit)
Tiago Muck has uploaded this change for review. (  
https://gem5-review.googlesource.com/c/public/gem5/+/63811?usp=email )



Change subject: configs: fix CHI config for Garnet
..

configs: fix CHI config for Garnet

CHI.py was not working with Garnet as ruby_system.network.buffer_size
only exists in SimpleNetwork.

Change-Id: I00e952f8881d385e3591c149e08c9c7a53fda2cd
Signed-off-by: Tiago Mück 
---
M configs/ruby/CHI.py
1 file changed, 15 insertions(+), 1 deletion(-)



diff --git a/configs/ruby/CHI.py b/configs/ruby/CHI.py
index d31d233..df97b92 100644
--- a/configs/ruby/CHI.py
+++ b/configs/ruby/CHI.py
@@ -266,7 +266,8 @@

 ruby_system.network.control_msg_size = params.cntrl_msg_size
 ruby_system.network.data_msg_size = params.data_width
-ruby_system.network.buffer_size = params.router_buffer_size
+if options.network == "simple":
+ruby_system.network.buffer_size = params.router_buffer_size

 # Incorporate the params into options so it's propagated to
 # makeTopology and create_topology the parent scripts

--
To view, visit  
https://gem5-review.googlesource.com/c/public/gem5/+/63811?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: I00e952f8881d385e3591c149e08c9c7a53fda2cd
Gerrit-Change-Number: 63811
Gerrit-PatchSet: 1
Gerrit-Owner: Tiago Muck 
Gerrit-MessageType: newchange
___
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]: misc: Reword CONTRIBUTING.md pre-commit documentation

2022-09-22 Thread Bobby Bruce (Gerrit)
Bobby Bruce has uploaded this change for review. (  
https://gem5-review.googlesource.com/c/public/gem5/+/63791?usp=email )



Change subject: misc: Reword CONTRIBUTING.md pre-commit documentation
..

misc: Reword CONTRIBUTING.md pre-commit documentation

This is a slight-rewording to make the usage of the pre-commit checks
clearer.

Change-Id: I73f9bfe7143a527c9e495cdf4d51e2aa857b43d5
---
M CONTRIBUTING.md
1 file changed, 19 insertions(+), 5 deletions(-)



diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index d81cd9c..ae771d3 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -143,14 +143,17 @@
 To help ensure the gem5 style guide is maintained, we use [pre-commit](
 https://pre-commit.com) to run checks on changes to be contributed.

-To setup pre-commit, run the following in your gem5 directory.
+To setup pre-commit, run the following in your gem5 directory to install  
the

+pre-commit and commit message hooks.

 ```sh
 pip install pre-commit
 pre-commit install -t pre-commit -t commit-msg
 ```

-When you run a `git commit` command the pre-commit will run checks on your
+The hooks are also automatically installed when gem5 is compiled.
+
+When you run a `git commit` command the pre-commit hook will run checks on  
your

 committed code. The commit will be blocked if a check fails.

 The same checks are run as part of Gerrit's CI tests (those required to  
obtain

@@ -158,11 +161,10 @@
 Therefore setting up pre-commit in your local gem5 development environment  
is

 recommended.

-You can automatically format your changed code to pass the pre-commit  
tests by

-running:
+You can automatically format files to pass the pre-commit tests by running:

 ```sh
-pre-commit run
+pre-commit run --files 
 ```

 Requirements for change descriptions

--
To view, visit  
https://gem5-review.googlesource.com/c/public/gem5/+/63791?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: I73f9bfe7143a527c9e495cdf4d51e2aa857b43d5
Gerrit-Change-Number: 63791
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] [S] Change in gem5/gem5[develop]: tests: Add 'requires' tests for ALL/gem5

2022-09-22 Thread Bobby Bruce (Gerrit)
Bobby Bruce has submitted this change. (  
https://gem5-review.googlesource.com/c/public/gem5/+/63433?usp=email )


 (

4 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the  
submitted one.

 )Change subject: tests: Add 'requires' tests for ALL/gem5
..

tests: Add 'requires' tests for ALL/gem5

Change-Id: I58012b092dc1ec027474e2e45ad3e9809b31578b
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/63433
Maintainer: Jason Lowe-Power 
Tested-by: kokoro 
Reviewed-by: Jason Lowe-Power 
---
M tests/gem5/stdlib/test_requires.py
1 file changed, 30 insertions(+), 0 deletions(-)

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




diff --git a/tests/gem5/stdlib/test_requires.py  
b/tests/gem5/stdlib/test_requires.py

index a70ca6b..293eb3d 100644
--- a/tests/gem5/stdlib/test_requires.py
+++ b/tests/gem5/stdlib/test_requires.py
@@ -58,3 +58,20 @@
 valid_isas=(isa_map[isa],),
 length=length_map[isa],
 )
+
+if isa != "null":
+gem5_verify_config(
+name=f"requires-isa-{isa}-with-all-compiled",
+verifiers=(),
+fixtures=(),
+config=joinpath(
+config.base_dir,
+"tests",
+"gem5",
+"configs",
+"requires_check.py",
+),
+config_args=["-i", isa],
+valid_isas=(constants.all_compiled_tag,),
+length=constants.quick_tag,
+)

--
To view, visit  
https://gem5-review.googlesource.com/c/public/gem5/+/63433?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: I58012b092dc1ec027474e2e45ad3e9809b31578b
Gerrit-Change-Number: 63433
Gerrit-PatchSet: 9
Gerrit-Owner: Bobby Bruce 
Gerrit-Reviewer: Bobby 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


[gem5-dev] [S] Change in gem5/gem5[develop]: tests: Update presubmit.sh to compile ALL/gem5.fast

2022-09-22 Thread Bobby Bruce (Gerrit)
Bobby Bruce has submitted this change. (  
https://gem5-review.googlesource.com/c/public/gem5/+/63371?usp=email )


 (

7 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the  
submitted one.

 )Change subject: tests: Update presubmit.sh to compile ALL/gem5.fast
..

tests: Update presubmit.sh to compile ALL/gem5.fast

This part of the Kokoro presubmit tests was designed to ensure gem5
still compiled sucessfully with Clang and to the '.fast' variant. ARM
was chosen arbitarily. Now that ALL exists, it makes more sense to use
it for this test.

Change-Id: Ia3593f7dd506205da13802a69094f4dd7019ab90
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/63371
Reviewed-by: Jason Lowe-Power 
Maintainer: Jason Lowe-Power 
Tested-by: kokoro 
---
M tests/jenkins/presubmit.sh
1 file changed, 20 insertions(+), 5 deletions(-)

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




diff --git a/tests/jenkins/presubmit.sh b/tests/jenkins/presubmit.sh
index 98c3d17..44ec8cf 100755
--- a/tests/jenkins/presubmit.sh
+++ b/tests/jenkins/presubmit.sh
@@ -61,12 +61,9 @@

 # 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
-# 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.
+# clang compiler.
 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/ARM_MESI_Three_Level_HTM/gem5.fast -j4 --no-compress-debug \
+build/ALL/gem5.fast -j4 --no-compress-debug \
 --ignore-style

--
To view, visit  
https://gem5-review.googlesource.com/c/public/gem5/+/63371?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: Ia3593f7dd506205da13802a69094f4dd7019ab90
Gerrit-Change-Number: 63371
Gerrit-PatchSet: 12
Gerrit-Owner: Bobby Bruce 
Gerrit-Reviewer: Bobby 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


[gem5-dev] [XL] Change in gem5/gem5[develop]: stdlib: Added RiscvMatched prebuilt board

2022-09-22 Thread Kunal Pai (Gerrit)
Kunal Pai has submitted this change. (  
https://gem5-review.googlesource.com/c/public/gem5/+/63411?usp=email )


Change subject: stdlib: Added RiscvMatched prebuilt board
..

stdlib: Added RiscvMatched prebuilt board

Modeled after the HiFive Unmatched.

For the cache, we inherited from AbstractClassicCacheHierarchy and
AbstractTwoLevelCacheHierarchy to make a PrivateL1PrivateL2 hierarchy
with the same associativity and sizes as the board. However, the L2
Size is kept as a parameter that can be set by the user.

The core is in-order, therefore we inherited from RISC-V MinorCPU and
used the same pipeline parameters as the ARM HPI CPU, except the
decodeToExecuteForwardDelay, which was increased to 2 to avoid a
PMC access fault.

For the processor, we initialized the core with an ID so that we can
return 4 cores in FS mode, which is the same as the real system,
and 1 in SE mode.

For the memory, we just have a single channel DDR4_2400 with a size of
16 GB and starting at 0x8000.

For the board, we declared a Boolean variable as a parameter to assign
whether it is in FS mode or not. We inherited from KernelDiskWorkload
and SEBinaryWorkload and initialized the components of the board
according to the Boolean. The other parameters are the clock frequency
and the L2 cache size.

Jira Issue: https://gem5.atlassian.net/browse/GEM5-1257

Change-Id: Ic2c066bb3a41dc2f42566ce971f9a665542f9771
Co-authored-by: Jasjeet Rangi 
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/63411
Reviewed-by: Bobby Bruce 
Maintainer: Bobby Bruce 
Tested-by: kokoro 
---
M src/python/SConscript
A src/python/gem5/prebuilt/riscvmatched/riscvmatched_board.py
A src/python/gem5/prebuilt/riscvmatched/riscvmatched_cache.py
A src/python/gem5/prebuilt/riscvmatched/riscvmatched_core.py
A src/python/gem5/prebuilt/riscvmatched/riscvmatched_processor.py
5 files changed, 1,039 insertions(+), 0 deletions(-)

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




diff --git a/src/python/SConscript b/src/python/SConscript
index e30075f..cbf88c9 100644
--- a/src/python/SConscript
+++ b/src/python/SConscript
@@ -224,6 +224,14 @@
 PySource('gem5.prebuilt', 'gem5/prebuilt/__init__.py')
 PySource('gem5.prebuilt.demo', 'gem5/prebuilt/demo/__init__.py')
 PySource('gem5.prebuilt.demo', 'gem5/prebuilt/demo/x86_demo_board.py')
+PySource('gem5.prebuilt.riscvmatched',
+'gem5/prebuilt/riscvmatched/riscvmatched_board.py')
+PySource('gem5.prebuilt.riscvmatched',
+'gem5/prebuilt/riscvmatched/riscvmatched_cache.py')
+PySource('gem5.prebuilt.riscvmatched',
+'gem5/prebuilt/riscvmatched/riscvmatched_processor.py')
+PySource('gem5.prebuilt.riscvmatched',
+'gem5/prebuilt/riscvmatched/riscvmatched_core.py')
 PySource('gem5.resources', 'gem5/resources/__init__.py')
 PySource('gem5.resources', 'gem5/resources/downloader.py')
 PySource('gem5.resources', 'gem5/resources/md5_utils.py')
diff --git a/src/python/gem5/prebuilt/riscvmatched/riscvmatched_board.py  
b/src/python/gem5/prebuilt/riscvmatched/riscvmatched_board.py

new file mode 100644
index 000..986f29e
--- /dev/null
+++ b/src/python/gem5/prebuilt/riscvmatched/riscvmatched_board.py
@@ -0,0 +1,594 @@
+# Copyright (c) 2022 The Regents of the University of California
+# Copyright (c) 2022 EXAscale Performance SYStems (EXAPSYS)
+# 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
+import re
+
+from typing import List, Optional

[gem5-dev] [S] Change in gem5/gem5[develop]: scons: Fix the default KVM_ISA setting.

2022-09-22 Thread Gabe Black (Gerrit)
Gabe Black has submitted this change. (  
https://gem5-review.googlesource.com/c/public/gem5/+/63752?usp=email )


Change subject: scons: Fix the default KVM_ISA setting.
..

scons: Fix the default KVM_ISA setting.

The KVM_ISA setting was moved into a CONF dict, but the code which
ensured it had a default if there was no possible KVM hosting ISA was
still setting that variable in the base environment dict. This moves
the setting into the CONF dict instead.

Change-Id: I067c969dd761b2cdb098bcba6cd6a4b643d2d427
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/63752
Reviewed-by: Earl Ou 
Tested-by: kokoro 
Maintainer: Gabe Black 
---
M src/cpu/kvm/SConsopts
1 file changed, 19 insertions(+), 1 deletion(-)

Approvals:
  kokoro: Regressions pass
  Gabe Black: Looks good to me, approved
  Earl Ou: Looks good to me, approved




diff --git a/src/cpu/kvm/SConsopts b/src/cpu/kvm/SConsopts
index e5818e0..275eeda 100644
--- a/src/cpu/kvm/SConsopts
+++ b/src/cpu/kvm/SConsopts
@@ -30,7 +30,7 @@
 import gem5_scons

 # ISA code can set this to indicate what ISA KVM can target.
-main.SetDefault(KVM_ISA='')
+main['CONF'].setdefault('KVM_ISA', '')

 with gem5_scons.Configure(main) as conf:
 # Check if we should enable KVM-based hardware virtualization. The

--
To view, visit  
https://gem5-review.googlesource.com/c/public/gem5/+/63752?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: I067c969dd761b2cdb098bcba6cd6a4b643d2d427
Gerrit-Change-Number: 63752
Gerrit-PatchSet: 2
Gerrit-Owner: Gabe Black 
Gerrit-Reviewer: Earl Ou 
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