def getBlockSizeBits(self, cache_line_size):
      bits = int(math.log(cache_line_size, 2))

  def getBlockSizeBits(self, cache_line_size):
      bits = int(math.log(cache_line_size, 2))

Ayaz Akram has submitted this change. ( https://gem5-review.googlesource.com/c/public/gem5/+/69297?usp=email ) Change subject: stdlib: Small fix in mesi three level component ...................................................................... stdlib: Small fix in mesi three level component This change ensures that if cache_line_size is not an integer type, we don't incorrectly raise the exception of cache size not equal to 2^bits. Change-Id: I5a06cdac820283feb54f23d805fd87490fae1c3b Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/69297 Tested-by: kokoro <noreply+kokoro@google.com> Reviewed-by: Jason Lowe-Power <power.jg@gmail.com> Maintainer: Jason Lowe-Power <power.jg@gmail.com> --- 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 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: Jason Lowe-Power: Looks good to me, approved; Looks good to me, approved kokoro: Regressions pass 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 b485481..e746579 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 @@ -92,7 +92,7 @@ def getBlockSizeBits(self, cache_line_size): bits = int(math.log(cache_line_size, 2)) - if 2**bits != cache_line_size: + if 2**bits != int(cache_line_size): raise Exception("Cache line size is not a power of 2!") return bits 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 d54e1ab..dfc1304 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 @@ -90,7 +90,7 @@ def getBlockSizeBits(self, cache_line_size): bits = int(math.log(cache_line_size, 2)) - if 2**bits != cache_line_size: + if 2**bits != int(cache_line_size): raise Exception("Cache line size is not a power of 2!") return bits -- To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/69297?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: I5a06cdac820283feb54f23d805fd87490fae1c3b Gerrit-Change-Number: 69297 Gerrit-PatchSet: 2 Gerrit-Owner: Ayaz Akram <yazakram@ucdavis.edu> Gerrit-Reviewer: Ayaz Akram <yazakram@ucdavis.edu> Gerrit-Reviewer: Bobby Bruce <bbruce@ucdavis.edu> Gerrit-Reviewer: Hoa Nguyen <hoanguyen@ucdavis.edu> Gerrit-Reviewer: Jason Lowe-Power <power.jg@gmail.com> Gerrit-Reviewer: kokoro <noreply+kokoro@google.com> Gerrit-MessageType: merged