From 59c4fd07cbc96fa22e4a32ef8c93bd958340ce65 Mon Sep 17 00:00:00 2001 From: CHEN Meng Date: Mon, 20 Sep 2021 04:31:52 +0800 Subject: [PATCH] base-stats: fix storage initializing Commit (70194795c3f41cc3f1e361b3cac24f839d86dd67) introduced std::vector with resize() to initializing all storages. This method caused data duplication in statistics. Storage is now initialized using loops. Change-Id: I4350863a83671fc10cc02b5cb7d3b38e6cf4f565 Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/50747 Reviewed-by: Bobby R. Bruce Reviewed-by: Hoa Nguyen Maintainer: Bobby R. Bruce Tested-by: kokoro --- src/base/statistics.hh | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/base/statistics.hh b/src/base/statistics.hh index 18f52cb580..8fc71eb52d 100644 --- a/src/base/statistics.hh +++ b/src/base/statistics.hh @@ -952,7 +952,10 @@ class VectorBase : public DataWrapVec fatal_if(s <= 0, "Storage size must be positive"); fatal_if(check(), "Stat has already been initialized"); - storage.resize(s, new Storage(this->info()->getStorageParams())); + storage.reserve(s); + for (size_type i = 0; i < s; ++i) + storage.push_back(new Storage(this->info()->getStorageParams())); + this->setInit(); } @@ -1178,7 +1181,10 @@ class Vector2dBase : public DataWrapVec2d info->x = _x; info->y = _y; - storage.resize(x * y, new Storage(info->getStorageParams())); + storage.reserve(x * y); + for (size_type i = 0; i < x * y; ++i) + storage.push_back(new Storage(this->info()->getStorageParams())); + this->setInit(); return self; @@ -1387,7 +1393,10 @@ class VectorDistBase : public DataWrapVec fatal_if(s <= 0, "Storage size must be positive"); fatal_if(check(), "Stat has already been initialized"); - storage.resize(s, new Storage(this->info()->getStorageParams())); + storage.reserve(s); + for (size_type i = 0; i < s; ++i) + storage.push_back(new Storage(this->info()->getStorageParams())); + this->setInit(); }