date:20230607

[gem5-dev] [S] Change in gem5/gem5[develop]: tests: Fix bugs related to gem5 Vision

2023-06-07 Thread Kunal Pai (Gerrit) via gem5-dev

Kunal Pai has submitted this change. (  
https://gem5-review.googlesource.com/c/public/gem5/+/71360?usp=email )


Change subject: tests: Fix bugs related to gem5 Vision
..

tests: Fix bugs related to gem5 Vision

This patch fixes refs under tests/pyunit/stdlib/resources.

Removes instances of {url_base} in refs.

Also, renames two refs: mongo_mock and mongo_dup_mock
to mongo-mock and mongo-dup-mock to follow naming
convention of other refs.

Change-Id: If115114bc7a89764e7c546b77a93d36d6a3b5f8a
Co-authored-by: Parth Shah 
Co-authored-by: Harshil2107 
Co-authored-by: aarsli 
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/71360
Tested-by: kokoro 
Reviewed-by: Bobby Bruce 
Maintainer: Bobby Bruce 
---
M tests/pyunit/stdlib/resources/pyunit_client_wrapper_checks.py
R tests/pyunit/stdlib/resources/refs/mongo-dup-mock.json
R tests/pyunit/stdlib/resources/refs/mongo-mock.json
M tests/pyunit/stdlib/resources/refs/workload-checks-custom-workload.json
M tests/pyunit/stdlib/resources/refs/workload-checks.json
5 files changed, 5 insertions(+), 5 deletions(-)

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




diff --git a/tests/pyunit/stdlib/resources/pyunit_client_wrapper_checks.py  
b/tests/pyunit/stdlib/resources/pyunit_client_wrapper_checks.py

index 96aadf6..344f67b 100644
--- a/tests/pyunit/stdlib/resources/pyunit_client_wrapper_checks.py
+++ b/tests/pyunit/stdlib/resources/pyunit_client_wrapper_checks.py
@@ -82,12 +82,12 @@

 mock_json = {}

-with open(Path(__file__).parent / "refs/mongo_mock.json", "r") as f:
+with open(Path(__file__).parent / "refs/mongo-mock.json", "r") as f:
 mock_json = json.load(f)

 duplicate_mock_json = {}

-with open(Path(__file__).parent / "refs/mongo_dup_mock.json", "r") as f:
+with open(Path(__file__).parent / "refs/mongo-dup-mock.json", "r") as f:
 duplicate_mock_json = json.load(f)


diff --git a/tests/pyunit/stdlib/resources/refs/mongo_dup_mock.json  
b/tests/pyunit/stdlib/resources/refs/mongo-dup-mock.json

similarity index 100%
rename from tests/pyunit/stdlib/resources/refs/mongo_dup_mock.json
rename to tests/pyunit/stdlib/resources/refs/mongo-dup-mock.json
diff --git a/tests/pyunit/stdlib/resources/refs/mongo_mock.json  
b/tests/pyunit/stdlib/resources/refs/mongo-mock.json

similarity index 100%
rename from tests/pyunit/stdlib/resources/refs/mongo_mock.json
rename to tests/pyunit/stdlib/resources/refs/mongo-mock.json
diff --git  
a/tests/pyunit/stdlib/resources/refs/workload-checks-custom-workload.json  
b/tests/pyunit/stdlib/resources/refs/workload-checks-custom-workload.json

index 8349b92..a7e9c9d 100644
---  
a/tests/pyunit/stdlib/resources/refs/workload-checks-custom-workload.json
+++  
b/tests/pyunit/stdlib/resources/refs/workload-checks-custom-workload.json

@@ -6,7 +6,7 @@
 "architecture": "X86",
 "is_zipped": false,
 "md5sum": "dbf120338b37153e3334603970cebd8c",
-"url": "{url_base}/test-progs/hello/bin/x86/linux/hello64-static",
+"url": 
"http://dist.gem5.org/dist/develop/test-progs/hello/bin/x86/linux/hello64-static;,
 "source": "src/simple",
 "resource_version": "1.0.0",
 "gem5_versions": [
diff --git a/tests/pyunit/stdlib/resources/refs/workload-checks.json  
b/tests/pyunit/stdlib/resources/refs/workload-checks.json

index d19396b..d41001d 100644
--- a/tests/pyunit/stdlib/resources/refs/workload-checks.json
+++ b/tests/pyunit/stdlib/resources/refs/workload-checks.json
@@ -6,7 +6,7 @@
 "architecture": "X86",
 "is_zipped": false,
 "md5sum": "4838c99b77d33c8307b939c16624e4ac",
-"url": "{url_base}/kernels/x86/static/vmlinux-5.2.3",
+"url": 
"http://dist.gem5.org/dist/develop/kernels/x86/static/vmlinux-5.2.3;,
 "source": "src/linux-kernel",
 "resource_version": "1.0.0",
 "gem5_versions": [
@@ -20,7 +20,7 @@
 "architecture": "X86",
 "is_zipped": true,
 "md5sum": "90e363abf0ddf22eefa2c7c5c9391c49",
-"url": "{url_base}/images/x86/ubuntu-18-04/x86-ubuntu.img.gz",
+"url": 
"http://dist.gem5.org/dist/develop/images/x86/ubuntu-18-04/x86-ubuntu.img.gz;,
 "source": "src/x86-ubuntu",
 "root_partition": "1",
 "resource_version": "1.0.0",

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


Gerrit-MessageType: merged
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: If115114bc7a89764e7c546b77a93d36d6a3b5f8a
Gerrit-Change-Number: 71360
Gerrit-PatchSet: 3
Gerrit-Owner: Kunal Pai 
Gerrit-Reviewer: Bobby Bruce 
Gerrit-Reviewer: Kunal Pai 
Gerrit-Reviewer: kokoro 
Gerrit-CC: kokoro 
___
gem5-dev mailing list -- gem5-dev@gem5.org
To

[gem5-dev] [M] Change in gem5/gem5[develop]: mem-cache: De-virtualize forEachBlk() in tags

2023-06-07 Thread Daniel Carvalho (Gerrit) via gem5-dev

Daniel Carvalho has submitted this change. (  
https://gem5-review.googlesource.com/c/public/gem5/+/70998?usp=email )


Change subject: mem-cache: De-virtualize forEachBlk() in tags
..

mem-cache: De-virtualize forEachBlk() in tags

Avoid code duplication by using the anyBlk function
with a lambda that always returns false, which forces
all blocks to be visited.

Change-Id: I25527602535c719f46699677a7f70f3e31157f26
Signed-off-by: Daniel R. Carvalho 
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/70998
Reviewed-by: Jason Lowe-Power 
Maintainer: Jason Lowe-Power 
Tested-by: kokoro 
---
M src/mem/cache/tags/base.cc
M src/mem/cache/tags/base.hh
M src/mem/cache/tags/base_set_assoc.hh
M src/mem/cache/tags/compressed_tags.cc
M src/mem/cache/tags/compressed_tags.hh
M src/mem/cache/tags/fa_lru.hh
M src/mem/cache/tags/sector_tags.cc
M src/mem/cache/tags/sector_tags.hh
8 files changed, 10 insertions(+), 49 deletions(-)

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




diff --git a/src/mem/cache/tags/base.cc b/src/mem/cache/tags/base.cc
index 560b041..8216f3d 100644
--- a/src/mem/cache/tags/base.cc
+++ b/src/mem/cache/tags/base.cc
@@ -215,6 +215,15 @@
 return str;
 }

+void
+BaseTags::forEachBlk(std::function visitor)
+{
+anyBlk([visitor](CacheBlk ) {
+visitor(blk);
+return false;
+});
+}
+
 BaseTags::BaseTagStats::BaseTagStats(BaseTags &_tags)
 : statistics::Group(&_tags),
 tags(_tags),
diff --git a/src/mem/cache/tags/base.hh b/src/mem/cache/tags/base.hh
index e270277..c491881 100644
--- a/src/mem/cache/tags/base.hh
+++ b/src/mem/cache/tags/base.hh
@@ -336,7 +336,7 @@
  *
  * @param visitor Visitor to call on each block.
  */
-virtual void forEachBlk(std::function visitor) = 0;
+void forEachBlk(std::function visitor);

 /**
  * Find if any of the blocks satisfies a condition
diff --git a/src/mem/cache/tags/base_set_assoc.hh  
b/src/mem/cache/tags/base_set_assoc.hh

index 22695d2..8ffb718 100644
--- a/src/mem/cache/tags/base_set_assoc.hh
+++ b/src/mem/cache/tags/base_set_assoc.hh
@@ -233,12 +233,6 @@
 return indexingPolicy->regenerateAddr(blk->getTag(), blk);
 }

-void forEachBlk(std::function visitor) override {
-for (CacheBlk& blk : blks) {
-visitor(blk);
-}
-}
-
 bool anyBlk(std::function visitor) override {
 for (CacheBlk& blk : blks) {
 if (visitor(blk)) {
diff --git a/src/mem/cache/tags/compressed_tags.cc  
b/src/mem/cache/tags/compressed_tags.cc

index 32d7401..c84718f 100644
--- a/src/mem/cache/tags/compressed_tags.cc
+++ b/src/mem/cache/tags/compressed_tags.cc
@@ -163,14 +163,6 @@
 return victim;
 }

-void
-CompressedTags::forEachBlk(std::function visitor)
-{
-for (CompressionBlk& blk : blks) {
-visitor(blk);
-}
-}
-
 bool
 CompressedTags::anyBlk(std::function visitor)
 {
diff --git a/src/mem/cache/tags/compressed_tags.hh  
b/src/mem/cache/tags/compressed_tags.hh

index b54efb0..6e5b62d 100644
--- a/src/mem/cache/tags/compressed_tags.hh
+++ b/src/mem/cache/tags/compressed_tags.hh
@@ -109,16 +109,6 @@
  std::vector& evict_blks) override;

 /**
- * Visit each sub-block in the tags and apply a visitor.
- *
- * The visitor should be a std::function that takes a cache block.
- * reference as its parameter.
- *
- * @param visitor Visitor to call on each block.
- */
-void forEachBlk(std::function visitor) override;
-
-/**
  * Find if any of the sub-blocks satisfies a condition.
  *
  * The visitor should be a std::function that takes a cache block
diff --git a/src/mem/cache/tags/fa_lru.hh b/src/mem/cache/tags/fa_lru.hh
index deffd72..cd07817 100644
--- a/src/mem/cache/tags/fa_lru.hh
+++ b/src/mem/cache/tags/fa_lru.hh
@@ -253,12 +253,6 @@
 return blk->getTag();
 }

-void forEachBlk(std::function visitor) override {
-for (int i = 0; i < numBlocks; i++) {
-visitor(blks[i]);
-}
-}
-
 bool anyBlk(std::function visitor) override {
 for (int i = 0; i < numBlocks; i++) {
 if (visitor(blks[i])) {
diff --git a/src/mem/cache/tags/sector_tags.cc  
b/src/mem/cache/tags/sector_tags.cc

index cb121eb..6a9ffd0 100644
--- a/src/mem/cache/tags/sector_tags.cc
+++ b/src/mem/cache/tags/sector_tags.cc
@@ -359,14 +359,6 @@
 }
 }

-void
-SectorTags::forEachBlk(std::function visitor)
-{
-for (SectorSubBlk& blk : blks) {
-visitor(blk);
-}
-}
-
 bool
 SectorTags::anyBlk(std::function visitor)
 {
diff --git a/src/mem/cache/tags/sector_tags.hh  
b/src/mem/cache/tags/sector_tags.hh

index bad1321..035b085 100644
--- a/src/mem/cache/tags/sector_tags.hh
+++ b/src/mem/cache/tags/sector_tags.hh
@@ -194,16 +194,6 @@
 Addr regenerateBlkAddr(const CacheBlk* blk) const override;

[gem5-dev] [XS] Change in gem5/gem5[develop]: scons: Fix grpc protobuf actions

2023-06-07 Thread Roger Chang (Gerrit) via gem5-dev

Roger Chang has submitted this change. (  
https://gem5-review.googlesource.com/c/public/gem5/+/71318?usp=email )


Change subject: scons: Fix grpc protobuf actions
..

scons: Fix grpc protobuf actions

The change will fix the proto import issue and build issue with
--no-duplicate-sources options, more details please reference:
https://gem5-review.googlesource.com/c/public/gem5/+/64491.

Change-Id: I259413f7739f89598dcd42c3f2e1e865cec3de43
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/71318
Reviewed-by: Jason Lowe-Power 
Tested-by: kokoro 
Maintainer: Jason Lowe-Power 
---
M src/SConscript
1 file changed, 3 insertions(+), 3 deletions(-)

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




diff --git a/src/SConscript b/src/SConscript
index 13f08d2..d26bf49 100644
--- a/src/SConscript
+++ b/src/SConscript
@@ -280,9 +280,9 @@
 root, ext = os.path.splitext(source[0].get_abspath())
 return [root + '.grpc.pb.cc', root + '.grpc.pb.h'], source

-protoc_grpc_action=MakeAction('${PROTOC} --grpc_out ${BUILDDIR} '
-'--plugin=protoc-gen-grpc=${PROTOC_GRPC} --proto_path ${BUILDDIR} '
-'${SOURCE.get_abspath()}',
+protoc_grpc_action=MakeAction('${PROTOC} --grpc_out ${TARGET.dir.abspath} '
+'--plugin=protoc-gen-grpc=${PROTOC_GRPC} '
+'--proto_path ${SOURCE.dir.abspath} ${SOURCE.abspath}',
 Transform("PROTOC"))

 env.Append(BUILDERS={'GrpcProtoBufCC' : Builder(

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


Gerrit-MessageType: merged
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: I259413f7739f89598dcd42c3f2e1e865cec3de43
Gerrit-Change-Number: 71318
Gerrit-PatchSet: 3
Gerrit-Owner: Roger Chang 
Gerrit-Reviewer: Bobby Bruce 
Gerrit-Reviewer: Gabe Black 
Gerrit-Reviewer: Jason Lowe-Power 
Gerrit-Reviewer: Roger Chang 
Gerrit-Reviewer: kokoro 
Gerrit-CC: kokoro 
___
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-v23-0]: tests: Fix bugs related to gem5 Vision

2023-06-07 Thread Bobby Bruce (Gerrit) via gem5-dev

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



Change subject: tests: Fix bugs related to gem5 Vision
..

tests: Fix bugs related to gem5 Vision

This patch fixes refs under tests/pyunit/stdlib/resources.

Removes instances of {url_base} in refs.

Also, renames two refs: mongo_mock and mongo_dup_mock
to mongo-mock and mongo-dup-mock to follow naming
convention of other refs.

Change-Id: If115114bc7a89764e7c546b77a93d36d6a3b5f8a
Co-authored-by: Parth Shah 
Co-authored-by: Harshil2107 
Co-authored-by: aarsli 
---
M tests/pyunit/stdlib/resources/pyunit_client_wrapper_checks.py
R tests/pyunit/stdlib/resources/refs/mongo-dup-mock.json
R tests/pyunit/stdlib/resources/refs/mongo-mock.json
M tests/pyunit/stdlib/resources/refs/workload-checks-custom-workload.json
M tests/pyunit/stdlib/resources/refs/workload-checks.json
5 files changed, 5 insertions(+), 5 deletions(-)



diff --git a/tests/pyunit/stdlib/resources/pyunit_client_wrapper_checks.py  
b/tests/pyunit/stdlib/resources/pyunit_client_wrapper_checks.py

index 96aadf6..344f67b 100644
--- a/tests/pyunit/stdlib/resources/pyunit_client_wrapper_checks.py
+++ b/tests/pyunit/stdlib/resources/pyunit_client_wrapper_checks.py
@@ -82,12 +82,12 @@

 mock_json = {}

-with open(Path(__file__).parent / "refs/mongo_mock.json", "r") as f:
+with open(Path(__file__).parent / "refs/mongo-mock.json", "r") as f:
 mock_json = json.load(f)

 duplicate_mock_json = {}

-with open(Path(__file__).parent / "refs/mongo_dup_mock.json", "r") as f:
+with open(Path(__file__).parent / "refs/mongo-dup-mock.json", "r") as f:
 duplicate_mock_json = json.load(f)


diff --git a/tests/pyunit/stdlib/resources/refs/mongo_dup_mock.json  
b/tests/pyunit/stdlib/resources/refs/mongo-dup-mock.json

similarity index 100%
rename from tests/pyunit/stdlib/resources/refs/mongo_dup_mock.json
rename to tests/pyunit/stdlib/resources/refs/mongo-dup-mock.json
diff --git a/tests/pyunit/stdlib/resources/refs/mongo_mock.json  
b/tests/pyunit/stdlib/resources/refs/mongo-mock.json

similarity index 100%
rename from tests/pyunit/stdlib/resources/refs/mongo_mock.json
rename to tests/pyunit/stdlib/resources/refs/mongo-mock.json
diff --git  
a/tests/pyunit/stdlib/resources/refs/workload-checks-custom-workload.json  
b/tests/pyunit/stdlib/resources/refs/workload-checks-custom-workload.json

index 8349b92..a7e9c9d 100644
---  
a/tests/pyunit/stdlib/resources/refs/workload-checks-custom-workload.json
+++  
b/tests/pyunit/stdlib/resources/refs/workload-checks-custom-workload.json

@@ -6,7 +6,7 @@
 "architecture": "X86",
 "is_zipped": false,
 "md5sum": "dbf120338b37153e3334603970cebd8c",
-"url": "{url_base}/test-progs/hello/bin/x86/linux/hello64-static",
+"url": 
"http://dist.gem5.org/dist/develop/test-progs/hello/bin/x86/linux/hello64-static;,
 "source": "src/simple",
 "resource_version": "1.0.0",
 "gem5_versions": [
diff --git a/tests/pyunit/stdlib/resources/refs/workload-checks.json  
b/tests/pyunit/stdlib/resources/refs/workload-checks.json

index d19396b..d41001d 100644
--- a/tests/pyunit/stdlib/resources/refs/workload-checks.json
+++ b/tests/pyunit/stdlib/resources/refs/workload-checks.json
@@ -6,7 +6,7 @@
 "architecture": "X86",
 "is_zipped": false,
 "md5sum": "4838c99b77d33c8307b939c16624e4ac",
-"url": "{url_base}/kernels/x86/static/vmlinux-5.2.3",
+"url": 
"http://dist.gem5.org/dist/develop/kernels/x86/static/vmlinux-5.2.3;,
 "source": "src/linux-kernel",
 "resource_version": "1.0.0",
 "gem5_versions": [
@@ -20,7 +20,7 @@
 "architecture": "X86",
 "is_zipped": true,
 "md5sum": "90e363abf0ddf22eefa2c7c5c9391c49",
-"url": "{url_base}/images/x86/ubuntu-18-04/x86-ubuntu.img.gz",
+"url": 
"http://dist.gem5.org/dist/develop/images/x86/ubuntu-18-04/x86-ubuntu.img.gz;,
 "source": "src/x86-ubuntu",
 "root_partition": "1",
 "resource_version": "1.0.0",

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


Gerrit-MessageType: newchange
Gerrit-Project: public/gem5
Gerrit-Branch: release-staging-v23-0
Gerrit-Change-Id: If115114bc7a89764e7c546b77a93d36d6a3b5f8a
Gerrit-Change-Number: 71378
Gerrit-PatchSet: 1
Gerrit-Owner: Bobby Bruce 
Gerrit-CC: Kunal Pai 
___
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 bugs related to gem5 Vision

2023-06-07 Thread Kunal Pai (Gerrit) via gem5-dev

Kunal Pai has uploaded this change for review. (  
https://gem5-review.googlesource.com/c/public/gem5/+/71360?usp=email )



Change subject: tests: Fix bugs related to gem5 Vision
..

tests: Fix bugs related to gem5 Vision

This patch fixes refs under tests/pyunit/stdlib/resources.

Removes instances of {url_base} in refs.

Also, renames two refs: mongo_mock and mongo_dup_mock
to mongo-mock and mongo-dup-mock to follow naming
convention of other refs.

Change-Id: If115114bc7a89764e7c546b77a93d36d6a3b5f8a
Co-authored-by: Parth Shah 
Co-authored-by: Harshil2107 
Co-authored-by: aarsli 
---
M tests/pyunit/stdlib/resources/pyunit_client_wrapper_checks.py
R tests/pyunit/stdlib/resources/refs/mongo-dup-mock.json
R tests/pyunit/stdlib/resources/refs/mongo-mock.json
M tests/pyunit/stdlib/resources/refs/workload-checks-custom-workload.json
M tests/pyunit/stdlib/resources/refs/workload-checks.json
5 files changed, 5 insertions(+), 5 deletions(-)



diff --git a/tests/pyunit/stdlib/resources/pyunit_client_wrapper_checks.py  
b/tests/pyunit/stdlib/resources/pyunit_client_wrapper_checks.py

index 96aadf6..344f67b 100644
--- a/tests/pyunit/stdlib/resources/pyunit_client_wrapper_checks.py
+++ b/tests/pyunit/stdlib/resources/pyunit_client_wrapper_checks.py
@@ -82,12 +82,12 @@

 mock_json = {}

-with open(Path(__file__).parent / "refs/mongo_mock.json", "r") as f:
+with open(Path(__file__).parent / "refs/mongo-mock.json", "r") as f:
 mock_json = json.load(f)

 duplicate_mock_json = {}

-with open(Path(__file__).parent / "refs/mongo_dup_mock.json", "r") as f:
+with open(Path(__file__).parent / "refs/mongo-dup-mock.json", "r") as f:
 duplicate_mock_json = json.load(f)


diff --git a/tests/pyunit/stdlib/resources/refs/mongo_dup_mock.json  
b/tests/pyunit/stdlib/resources/refs/mongo-dup-mock.json

similarity index 100%
rename from tests/pyunit/stdlib/resources/refs/mongo_dup_mock.json
rename to tests/pyunit/stdlib/resources/refs/mongo-dup-mock.json
diff --git a/tests/pyunit/stdlib/resources/refs/mongo_mock.json  
b/tests/pyunit/stdlib/resources/refs/mongo-mock.json

similarity index 100%
rename from tests/pyunit/stdlib/resources/refs/mongo_mock.json
rename to tests/pyunit/stdlib/resources/refs/mongo-mock.json
diff --git  
a/tests/pyunit/stdlib/resources/refs/workload-checks-custom-workload.json  
b/tests/pyunit/stdlib/resources/refs/workload-checks-custom-workload.json

index 8349b92..f336915 100644
---  
a/tests/pyunit/stdlib/resources/refs/workload-checks-custom-workload.json
+++  
b/tests/pyunit/stdlib/resources/refs/workload-checks-custom-workload.json

@@ -6,7 +6,7 @@
 "architecture": "X86",
 "is_zipped": false,
 "md5sum": "dbf120338b37153e3334603970cebd8c",
-"url": "{url_base}/test-progs/hello/bin/x86/linux/hello64-static",
+"url": 
"https://dist.gem5.org/dist/develop/test-progs/hello/bin/x86/linux/hello64-static;,
 "source": "src/simple",
 "resource_version": "1.0.0",
 "gem5_versions": [
diff --git a/tests/pyunit/stdlib/resources/refs/workload-checks.json  
b/tests/pyunit/stdlib/resources/refs/workload-checks.json

index d19396b..c9554a9 100644
--- a/tests/pyunit/stdlib/resources/refs/workload-checks.json
+++ b/tests/pyunit/stdlib/resources/refs/workload-checks.json
@@ -6,7 +6,7 @@
 "architecture": "X86",
 "is_zipped": false,
 "md5sum": "4838c99b77d33c8307b939c16624e4ac",
-"url": "{url_base}/kernels/x86/static/vmlinux-5.2.3",
+"url": 
"https://dist.gem5.org/dist/develop/kernels/x86/static/vmlinux-5.2.3;,
 "source": "src/linux-kernel",
 "resource_version": "1.0.0",
 "gem5_versions": [
@@ -20,7 +20,7 @@
 "architecture": "X86",
 "is_zipped": true,
 "md5sum": "90e363abf0ddf22eefa2c7c5c9391c49",
-"url": "{url_base}/images/x86/ubuntu-18-04/x86-ubuntu.img.gz",
+"url": 
"https://dist.gem5.org/dist/develop/images/x86/ubuntu-18-04/x86-ubuntu.img.gz;,
 "source": "src/x86-ubuntu",
 "root_partition": "1",
 "resource_version": "1.0.0",

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


Gerrit-MessageType: newchange
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: If115114bc7a89764e7c546b77a93d36d6a3b5f8a
Gerrit-Change-Number: 71360
Gerrit-PatchSet: 1
Gerrit-Owner: Kunal Pai 
___
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 bugs related to gem5 Vision

2023-06-07 Thread Kunal Pai (Gerrit) via gem5-dev

Kunal Pai has uploaded this change for review. (  
https://gem5-review.googlesource.com/c/public/gem5/+/71359?usp=email )



Change subject: tests: Fix bugs related to gem5 Vision
..

tests: Fix bugs related to gem5 Vision

This patch fixes refs under tests/pyunit/stdlib/resources.

Removes instances of {url_base} in refs.

Also, renames two refs: mongo_mock and mongo_dup_mock
to mongo-mock and mongo-dup-mock to follow naming
convention of other refs.

Change-Id: I2d0b617e3c4aecf7c8239b8e8af614b6b2a1b530
Co-authored-by: Parth Shah 
Co-authored-by: Harshil2107 
Co-authored-by: aarsli 
---
M tests/pyunit/stdlib/resources/pyunit_client_wrapper_checks.py
R tests/pyunit/stdlib/resources/refs/mongo-dup-mock.json
R tests/pyunit/stdlib/resources/refs/mongo-mock.json
M tests/pyunit/stdlib/resources/refs/workload-checks-custom-workload.json
M tests/pyunit/stdlib/resources/refs/workload-checks.json
5 files changed, 8 insertions(+), 8 deletions(-)



diff --git a/tests/pyunit/stdlib/resources/pyunit_client_wrapper_checks.py  
b/tests/pyunit/stdlib/resources/pyunit_client_wrapper_checks.py

index 96aadf6..344f67b 100644
--- a/tests/pyunit/stdlib/resources/pyunit_client_wrapper_checks.py
+++ b/tests/pyunit/stdlib/resources/pyunit_client_wrapper_checks.py
@@ -82,12 +82,12 @@

 mock_json = {}

-with open(Path(__file__).parent / "refs/mongo_mock.json", "r") as f:
+with open(Path(__file__).parent / "refs/mongo-mock.json", "r") as f:
 mock_json = json.load(f)

 duplicate_mock_json = {}

-with open(Path(__file__).parent / "refs/mongo_dup_mock.json", "r") as f:
+with open(Path(__file__).parent / "refs/mongo-dup-mock.json", "r") as f:
 duplicate_mock_json = json.load(f)


diff --git a/tests/pyunit/stdlib/resources/refs/mongo_dup_mock.json  
b/tests/pyunit/stdlib/resources/refs/mongo-dup-mock.json

similarity index 90%
rename from tests/pyunit/stdlib/resources/refs/mongo_dup_mock.json
rename to tests/pyunit/stdlib/resources/refs/mongo-dup-mock.json
index fe87cc8..c5e7ecd 100644
--- a/tests/pyunit/stdlib/resources/refs/mongo_dup_mock.json
+++ b/tests/pyunit/stdlib/resources/refs/mongo-dup-mock.json
@@ -21,7 +21,7 @@
 "23.0"
 ],
 "workload_name": "x86-print-this-15000-with-simpoints",
-"example_usage": 
"get_resource(resource_name=\"x86-print-this-1500-simpoints\")",
+"example_usage": 
"obtain_resource(resource_name=\"x86-print-this-1500-simpoints\")",
 "workloads": [
 "x86-print-this-15000-with-simpoints",
 "x86-print-this-15000-with-simpoints-and-checkpoint"
diff --git a/tests/pyunit/stdlib/resources/refs/mongo_mock.json  
b/tests/pyunit/stdlib/resources/refs/mongo-mock.json

similarity index 95%
rename from tests/pyunit/stdlib/resources/refs/mongo_mock.json
rename to tests/pyunit/stdlib/resources/refs/mongo-mock.json
index b6376cc..11469b0 100644
--- a/tests/pyunit/stdlib/resources/refs/mongo_mock.json
+++ b/tests/pyunit/stdlib/resources/refs/mongo-mock.json
@@ -51,6 +51,6 @@
 "gem5_versions": [
 "23.0"
 ],
-"example_usage": "get_resource(resource_name=\"x86-ubuntu-18.04-img\")"
+"example_usage": 
"obtain_resource(resource_name=\"x86-ubuntu-18.04-img\")"
 }
 ]
diff --git  
a/tests/pyunit/stdlib/resources/refs/workload-checks-custom-workload.json  
b/tests/pyunit/stdlib/resources/refs/workload-checks-custom-workload.json

index 5c03ae0..f336915 100644
---  
a/tests/pyunit/stdlib/resources/refs/workload-checks-custom-workload.json
+++  
b/tests/pyunit/stdlib/resources/refs/workload-checks-custom-workload.json

@@ -6,11 +6,11 @@
 "architecture": "X86",
 "is_zipped": false,
 "md5sum": "dbf120338b37153e3334603970cebd8c",
-"url": "{url_base}/test-progs/hello/bin/x86/linux/hello64-static",
+"url": 
"https://dist.gem5.org/dist/develop/test-progs/hello/bin/x86/linux/hello64-static;,
 "source": "src/simple",
 "resource_version": "1.0.0",
 "gem5_versions": [
 "23.0"
 ]
 }
-]
\ No newline at end of file
+]
diff --git a/tests/pyunit/stdlib/resources/refs/workload-checks.json  
b/tests/pyunit/stdlib/resources/refs/workload-checks.json

index d19396b..c9554a9 100644
--- a/tests/pyunit/stdlib/resources/refs/workload-checks.json
+++ b/tests/pyunit/stdlib/resources/refs/workload-checks.json
@@ -6,7 +6,7 @@
 "architecture": "X86",
 "is_zipped": false,
 "md5sum": "4838c99b77d33c8307b939c16624e4ac",
-"url": "{url_base}/kernels/x86/static/vmlinux-5.2.3",
+"url": 
"https://dist.gem5.org/dist/develop/kernels/x86/static/vmlinux-5.2.3;,
 "source": "src/linux-kernel",
 "resource_version": "1.0.0",
 "gem5_versions": [
@@ -20,7 +20,7 @@
 "architecture": "X86",
 "is_zipped": true,
 "md5sum": "90e363abf0ddf22eefa2c7c5c9391c49",
-"url":

[gem5-dev] [S] Change in gem5/gem5[release-staging-v23-0]: arch-arm: Apply FEAT_IDST to missing ID registers

2023-06-07 Thread Giacomo Travaglini (Gerrit) via gem5-dev

Giacomo Travaglini has submitted this change. (  
https://gem5-review.googlesource.com/c/public/gem5/+/71178?usp=email )


Change subject: arch-arm: Apply FEAT_IDST to missing ID registers
..

arch-arm: Apply FEAT_IDST to missing ID registers

When FEAT_IDST got implemented [1], we forgot to add the
logic for AArch64 ID registers tracking AArch32 state/capabilities

[1]: https://gem5-review.googlesource.com/c/public/gem5/+/70723

Signed-off-by: Giacomo Travaglini 
Change-Id: I19bddf67ecc379a14f91cfede385692536982101
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/71178
Reviewed-by: Jason Lowe-Power 
Tested-by: kokoro 
Reviewed-by: Richard Cooper 
Reviewed-by: Bobby Bruce 
Maintainer: Bobby Bruce 
Maintainer: Jason Lowe-Power 
---
M src/arch/arm/regs/misc.cc
1 file changed, 21 insertions(+), 0 deletions(-)

Approvals:
  Bobby Bruce: Looks good to me, approved; Looks good to me, approved
  Jason Lowe-Power: Looks good to me, but someone else must approve; Looks  
good to me, approved

  Richard Cooper: Looks good to me, approved
  kokoro: Regressions pass




diff --git a/src/arch/arm/regs/misc.cc b/src/arch/arm/regs/misc.cc
index f32aa72..f1c69cc 100644
--- a/src/arch/arm/regs/misc.cc
+++ b/src/arch/arm/regs/misc.cc
@@ -3911,83 +3911,104 @@
   .mapsTo(MISCREG_MIDR);
 InitReg(MISCREG_MPIDR_EL1)
   .allPrivileges().exceptUserMode().writes(0)
+  .faultRead(EL0, faultIdst)
   .mapsTo(MISCREG_MPIDR);
 InitReg(MISCREG_REVIDR_EL1)
+  .faultRead(EL0, faultIdst)
   .faultRead(EL1, HCR_TRAP(tid1))
   .allPrivileges().exceptUserMode().writes(0);
 InitReg(MISCREG_ID_PFR0_EL1)
   .allPrivileges().exceptUserMode().writes(0)
+  .faultRead(EL0, faultIdst)
   .faultRead(EL1, HCR_TRAP(tid3))
   .mapsTo(MISCREG_ID_PFR0);
 InitReg(MISCREG_ID_PFR1_EL1)
   .allPrivileges().exceptUserMode().writes(0)
+  .faultRead(EL0, faultIdst)
   .faultRead(EL1, HCR_TRAP(tid3))
   .mapsTo(MISCREG_ID_PFR1);
 InitReg(MISCREG_ID_DFR0_EL1)
   .allPrivileges().exceptUserMode().writes(0)
+  .faultRead(EL0, faultIdst)
   .faultRead(EL1, HCR_TRAP(tid3))
   .mapsTo(MISCREG_ID_DFR0);
 InitReg(MISCREG_ID_AFR0_EL1)
   .allPrivileges().exceptUserMode().writes(0)
+  .faultRead(EL0, faultIdst)
   .faultRead(EL1, HCR_TRAP(tid3))
   .mapsTo(MISCREG_ID_AFR0);
 InitReg(MISCREG_ID_MMFR0_EL1)
   .allPrivileges().exceptUserMode().writes(0)
+  .faultRead(EL0, faultIdst)
   .faultRead(EL1, HCR_TRAP(tid3))
   .mapsTo(MISCREG_ID_MMFR0);
 InitReg(MISCREG_ID_MMFR1_EL1)
   .allPrivileges().exceptUserMode().writes(0)
+  .faultRead(EL0, faultIdst)
   .faultRead(EL1, HCR_TRAP(tid3))
   .mapsTo(MISCREG_ID_MMFR1);
 InitReg(MISCREG_ID_MMFR2_EL1)
   .allPrivileges().exceptUserMode().writes(0)
+  .faultRead(EL0, faultIdst)
   .faultRead(EL1, HCR_TRAP(tid3))
   .mapsTo(MISCREG_ID_MMFR2);
 InitReg(MISCREG_ID_MMFR3_EL1)
   .allPrivileges().exceptUserMode().writes(0)
+  .faultRead(EL0, faultIdst)
   .faultRead(EL1, HCR_TRAP(tid3))
   .mapsTo(MISCREG_ID_MMFR3);
 InitReg(MISCREG_ID_MMFR4_EL1)
   .allPrivileges().exceptUserMode().writes(0)
+  .faultRead(EL0, faultIdst)
   .faultRead(EL1, HCR_TRAP(tid3))
   .mapsTo(MISCREG_ID_MMFR4);
 InitReg(MISCREG_ID_ISAR0_EL1)
   .allPrivileges().exceptUserMode().writes(0)
+  .faultRead(EL0, faultIdst)
   .faultRead(EL1, HCR_TRAP(tid3))
   .mapsTo(MISCREG_ID_ISAR0);
 InitReg(MISCREG_ID_ISAR1_EL1)
   .allPrivileges().exceptUserMode().writes(0)
+  .faultRead(EL0, faultIdst)
   .faultRead(EL1, HCR_TRAP(tid3))
   .mapsTo(MISCREG_ID_ISAR1);
 InitReg(MISCREG_ID_ISAR2_EL1)
   .allPrivileges().exceptUserMode().writes(0)
+  .faultRead(EL0, faultIdst)
   .faultRead(EL1, HCR_TRAP(tid3))
   .mapsTo(MISCREG_ID_ISAR2);
 InitReg(MISCREG_ID_ISAR3_EL1)
   .allPrivileges().exceptUserMode().writes(0)
+  .faultRead(EL0, faultIdst)
   .faultRead(EL1, HCR_TRAP(tid3))
   .mapsTo(MISCREG_ID_ISAR3);
 InitReg(MISCREG_ID_ISAR4_EL1)
   .allPrivileges().exceptUserMode().writes(0)
+  .faultRead(EL0, faultIdst)
   .faultRead(EL1, HCR_TRAP(tid3))
   .mapsTo(MISCREG_ID_ISAR4);
 InitReg(MISCREG_ID_ISAR5_EL1)
   .allPrivileges().exceptUserMode().writes(0)
+  .faultRead(EL0, faultIdst)
   .faultRead(EL1, HCR_TRAP(tid3))
   .mapsTo(MISCREG_ID_ISAR5);
 InitReg(MISCREG_ID_ISAR6_EL1)
   .allPrivileges().exceptUserMode().writes(0)
+  .faultRead(EL0, faultIdst)
   .faultRead(EL1, HCR_TRAP(tid3))
   .mapsTo(MISCREG_ID_ISAR6);
 InitReg(MISCREG_MVFR0_EL1)
+  .faultRead(EL0, faultIdst)
   .faultRead(EL1, HCR_TRAP(tid3))
   .allPrivileges().exceptUserMode().writes(0)
   .mapsTo(MISCREG_MVFR0);
 InitReg(MISCREG_MVFR1_EL1)
+

[gem5-dev] [S] Change in gem5/gem5[develop]: tests: Fix bugs related to gem5 Vision

[gem5-dev] [M] Change in gem5/gem5[develop]: mem-cache: De-virtualize forEachBlk() in tags

[gem5-dev] [XS] Change in gem5/gem5[develop]: scons: Fix grpc protobuf actions

[gem5-dev] [S] Change in gem5/gem5[release-staging-v23-0]: tests: Fix bugs related to gem5 Vision

[gem5-dev] [S] Change in gem5/gem5[develop]: tests: Fix bugs related to gem5 Vision

[gem5-dev] [S] Change in gem5/gem5[develop]: tests: Fix bugs related to gem5 Vision

[gem5-dev] [S] Change in gem5/gem5[release-staging-v23-0]: arch-arm: Apply FEAT_IDST to missing ID registers

7 matches

Site Navigation

Mail list logo

Footer information