[gem5-dev] Change in gem5/gem5[develop]: mem-cache: Clear prefetch bit for CleanEvict before propagating to do...
Huang Jiasen has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/54364 )
Change subject: mem-cache: Clear prefetch bit for CleanEvict before
propagating to downstream caches
..
mem-cache: Clear prefetch bit for CleanEvict before propagating to
downstream caches
Change-Id: Iab56b9266eb64baf972b160774aca0823faea458
---
M src/mem/cache/base.cc
1 file changed, 14 insertions(+), 0 deletions(-)
diff --git a/src/mem/cache/base.cc b/src/mem/cache/base.cc
index dc21151..69c01cb 100644
--- a/src/mem/cache/base.cc
+++ b/src/mem/cache/base.cc
@@ -1310,6 +1310,11 @@
// propagating further down the hierarchy. Returning true will
// treat the CleanEvict like a satisfied write request and
delete
// it.
+
+if (blk->wasPrefetched()) {
+blk->clearPrefetched();
+}
+
return true;
}
// We didn't find the block here, propagate the CleanEvict further
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/54364
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: Iab56b9266eb64baf972b160774aca0823faea458
Gerrit-Change-Number: 54364
Gerrit-PatchSet: 1
Gerrit-Owner: Huang Jiasen
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-2]: configs,tests: Update refs to deprecated 'x86-ubuntu-img'
Bobby Bruce has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/54583 )
Change subject: configs,tests: Update refs to deprecated 'x86-ubuntu-img'
..
configs,tests: Update refs to deprecated 'x86-ubuntu-img'
This resource has been deprecated in favor of 'x86-ubuntu-18.04-img'. In
practise, these are the same resource (i.e., the same disk image), but
we deprecate 'x86-ubuntu-img' as 'x86-ubuntu-18.04-img' is more explicit
on what the disk image contains. Going forward we may want different
disk image resources with different Ubuntu versions, and we want it to
be clear what the user is retrieving.
Change-Id: I06b08e6b65cf431067ffda35ebd10d419068d073
---
M tests/gem5/configs/boot_kvm_fork_run.py
M tests/gem5/configs/boot_kvm_switch_exit.py
M configs/example/gem5_library/x86-ubuntu-run-with-kvm.py
M configs/example/gem5_library/x86-ubuntu-run.py
M tests/gem5/configs/x86_boot_exit_run.py
5 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/configs/example/gem5_library/x86-ubuntu-run-with-kvm.py
b/configs/example/gem5_library/x86-ubuntu-run-with-kvm.py
index fa84960..1aea258 100644
--- a/configs/example/gem5_library/x86-ubuntu-run-with-kvm.py
+++ b/configs/example/gem5_library/x86-ubuntu-run-with-kvm.py
@@ -121,7 +121,7 @@
kernel=Resource("x86-linux-kernel-5.4.49"),
# The x86 ubuntu image will be automatically downloaded to the if not
# already present.
-disk_image=Resource("x86-ubuntu-img"),
+disk_image=Resource("x86-ubuntu-18.04-img"),
readfile_contents=command,
)
diff --git a/configs/example/gem5_library/x86-ubuntu-run.py
b/configs/example/gem5_library/x86-ubuntu-run.py
index c6f6f83..2aee8c7 100644
--- a/configs/example/gem5_library/x86-ubuntu-run.py
+++ b/configs/example/gem5_library/x86-ubuntu-run.py
@@ -58,7 +58,7 @@
# downloaded.
board.set_kernel_disk_workload(
kernel=Resource("x86-linux-kernel-5.4.49"),
-disk_image=Resource("x86-ubuntu-img"),
+disk_image=Resource("x86-ubuntu-18.04-img"),
)
simulator = Simulator(board=board)
diff --git a/tests/gem5/configs/boot_kvm_fork_run.py
b/tests/gem5/configs/boot_kvm_fork_run.py
index 2cd180a..662ef23 100644
--- a/tests/gem5/configs/boot_kvm_fork_run.py
+++ b/tests/gem5/configs/boot_kvm_fork_run.py
@@ -203,7 +203,7 @@
resource_directory=args.resource_directory,
),
disk_image=Resource(
-"x86-ubuntu-img",
+"x86-ubuntu-18.04-img",
resource_directory=args.resource_directory,
),
readfile_contents=dedent(
diff --git a/tests/gem5/configs/boot_kvm_switch_exit.py
b/tests/gem5/configs/boot_kvm_switch_exit.py
index 9f5f7ee..5cfee40 100644
--- a/tests/gem5/configs/boot_kvm_switch_exit.py
+++ b/tests/gem5/configs/boot_kvm_switch_exit.py
@@ -188,7 +188,7 @@
resource_directory=args.resource_directory,
),
disk_image=Resource(
-"x86-ubuntu-img",
+"x86-ubuntu-18.04-img",
resource_directory=args.resource_directory,
),
# The first exit signals to switch processors.
diff --git a/tests/gem5/configs/x86_boot_exit_run.py
b/tests/gem5/configs/x86_boot_exit_run.py
index 5c8b025..93c9028 100644
--- a/tests/gem5/configs/x86_boot_exit_run.py
+++ b/tests/gem5/configs/x86_boot_exit_run.py
@@ -207,7 +207,7 @@
resource_directory=args.resource_directory,
),
disk_image=Resource(
-"x86-ubuntu-img",
+"x86-ubuntu-18.04-img",
resource_directory=args.resource_directory,
),
kernel_args=kernal_args,
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/54583
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: release-staging-v21-2
Gerrit-Change-Id: I06b08e6b65cf431067ffda35ebd10d419068d073
Gerrit-Change-Number: 54583
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
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
[gem5-dev] Change in gem5/gem5[release-staging-v21-2]: scons: Remove the '-Wno-c99-designator' Cxx clang flag
Bobby Bruce has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/54543 )
Change subject: scons: Remove the '-Wno-c99-designator' Cxx clang flag
..
scons: Remove the '-Wno-c99-designator' Cxx clang flag
The following warning was being generated when using clang-9:
```
warning: unknown warning option '-Wno-c99-designator'; did you
mean '-Wno-gnu-designator'? [-Wunknown-warning-option]
```
The simplest solution, for the gem5 21-2 release was to remove this
flag.
Change-Id: I87b460388a1af6e6b72d36caf32b2fb949fdc8ca
---
M SConstruct
1 file changed, 18 insertions(+), 1 deletion(-)
diff --git a/SConstruct b/SConstruct
index ceeb1ba..3e7a593 100755
--- a/SConstruct
+++ b/SConstruct
@@ -403,7 +403,6 @@
# clang has a few additional warnings that we disable.
with gem5_scons.Configure(main) as conf:
-conf.CheckCxxFlag('-Wno-c99-designator')
conf.CheckCxxFlag('-Wno-defaulted-function-deleted')
main.Append(TCMALLOC_CCFLAGS=['-fno-builtin'])
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/54543
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: release-staging-v21-2
Gerrit-Change-Id: I87b460388a1af6e6b72d36caf32b2fb949fdc8ca
Gerrit-Change-Number: 54543
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
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
[gem5-dev] Change in gem5/gem5[develop]: base: Finish deprecating SatCounter
Daniel Carvalho has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/54523 )
Change subject: base: Finish deprecating SatCounter
..
base: Finish deprecating SatCounter
SatCounter has been marked as deprecated for at least 2 versions,
so it can be removed.
Change-Id: Iffb75822cc0d09d8b7d9b86828b26198865ce407
Signed-off-by: Daniel R. Carvalho
---
M src/base/sat_counter.hh
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/src/base/sat_counter.hh b/src/base/sat_counter.hh
index 6644b05..a607c4c 100644
--- a/src/base/sat_counter.hh
+++ b/src/base/sat_counter.hh
@@ -340,9 +340,6 @@
typedef GenericSatCounter SatCounter64;
/** @} */
-[[deprecated("Use SatCounter8 (or variants) instead")]]
-typedef SatCounter8 SatCounter;
-
} // namespace gem5
#endif // __BASE_SAT_COUNTER_HH__
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/54523
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: Iffb75822cc0d09d8b7d9b86828b26198865ce407
Gerrit-Change-Number: 54523
Gerrit-PatchSet: 1
Gerrit-Owner: Daniel Carvalho
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
