derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

base: Add fatal tests to sat_counter

Browse Source 
Add tests to make sure that the fatal conditions are
triggered when met.

This commit also moves shift-related death tests to
their own DeathTests.

Change-Id: Ia610636fe8cf636401e2b2ed623bf20b41147ea4
Signed-off-by: Daniel R. Carvalho <odanrc@yahoo.com.br>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/42763
Reviewed-by: Gabe Black <gabe.black@gmail.com>
Maintainer: Bobby R. Bruce <bbruce@ucdavis.edu>
Tested-by: kokoro <noreply+kokoro@google.com>
This commit is contained in:
Daniel R. Carvalho
2021-03-10 11:15:02 -03:00
committed by Daniel Carvalho
parent 89958f7f30
commit be37868ca6
2 changed files with 63 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/base/sat_counter.hh
View File

@@ -78,7 +78,7 @@ class GenericSatCounter
fatal_if(bits > 8*sizeof(T),
"Number of bits exceeds counter size");
fatal_if(initial_val > maxVal,
"Saturating counter's Initial value exceeds max value.");
"Saturating counter's initial value exceeds max value.");
}
/**

68
src/base/sat_counter.test.cc
View File

@@ -31,8 +31,43 @@
#include <utility>
#include "base/gtest/logging.hh"
#include "base/sat_counter.hh"
/**
* Test that an error is triggered when the number of bits exceeds the
* counter's capacity.
*/
TEST(SatCounterDeathTest, BitCountExceeds)
{
#ifdef NDEBUG
GTEST_SKIP() << "Skipping as assertions are "
"stripped out of fast builds";
#endif
gtestLogOutput.str("");
EXPECT_ANY_THROW(SatCounter8 counter(9));
ASSERT_NE(gtestLogOutput.str().find("Number of bits exceeds counter size"),
std::string::npos);
}
/**
* Test that an error is triggered when the initial value is higher than the
* maximum possible value.
*/
TEST(SatCounterDeathTest, InitialValueExceeds)
{
#ifdef NDEBUG
GTEST_SKIP() << "Skipping as assertions are "
"stripped out of fast builds";
#endif
gtestLogOutput.str("");
EXPECT_ANY_THROW(SatCounter8 counter(7, 128));
ASSERT_NE(gtestLogOutput.str().find("initial value exceeds max value"),
std::string::npos);
}
/**
* Test if the maximum value is indeed the maximum value reachable.
*/
@@ -183,15 +218,36 @@ TEST(SatCounterTest, Shift)
ASSERT_EQ(counter, value);
counter >>= saturated_counter;
ASSERT_EQ(counter, 0);
}
// Make sure the counters cannot be shifted by negative numbers, since
// that is undefined behaviour. As these tests depend on asserts failing,
// these tests are only functional if `TRACING_ON == 1`, when gem5 is
// compiled as `debug` or `opt`.
#if TRACING_ON
/**
* Make sure the counters cannot be right-shifted by negative numbers, since
* that is undefined behaviour
*/
TEST(SatCounterDeathTest, RightShiftNegative)
{
#ifdef NDEBUG
GTEST_SKIP() << "Skipping as assertions are "
"stripped out of fast builds";
#endif
SatCounter8 counter(8);
ASSERT_DEATH(counter >>= -1, "");
}
/**
* Make sure the counters cannot be left-shifted by negative numbers, since
* that is undefined behaviour
*/
TEST(SatCounterDeathTest, LeftShiftNegative)
{
#ifdef NDEBUG
GTEST_SKIP() << "Skipping as assertions are "
"stripped out of fast builds";
#endif
SatCounter8 counter(8);
ASSERT_DEATH(counter <<= -1, "");
#endif
}
/**