Feature: Rewrote AddressDecoder
This commit is contained in:
committed by
Lukas Steiner
parent
ee04212ddb
commit
ce1332ca81
@@ -35,11 +35,14 @@
|
||||
|
||||
#include "AddressDecoderConfigs.h"
|
||||
|
||||
#include <bitset>
|
||||
#include "gtest/gtest-spi.h"
|
||||
#include <gtest/gtest.h>
|
||||
|
||||
#include <DRAMSys/simulation/AddressDecoder.h>
|
||||
|
||||
#include "DRAMSys/configuration/memspec/MemSpec.h"
|
||||
#include "DRAMSys/configuration/memspec/MemSpecDDR4.h"
|
||||
|
||||
class AddressDecoderFixture : public ::testing::Test
|
||||
{
|
||||
protected:
|
||||
@@ -55,10 +58,13 @@ protected:
|
||||
DRAMSys::AddressDecoder addressDecoder;
|
||||
};
|
||||
|
||||
|
||||
TEST_F(AddressDecoderFixture, Decoding)
|
||||
{
|
||||
uint64_t address = 0x3A59'1474;
|
||||
auto decodedAddress = addressDecoder.decodeAddress(address);
|
||||
tlm::tlm_generic_payload trans;
|
||||
trans.set_address(address);
|
||||
auto decodedAddress = addressDecoder.decodeAddress(trans);
|
||||
|
||||
unsigned int channel = decodedAddress.channel;
|
||||
unsigned int rank = decodedAddress.rank;
|
||||
@@ -66,7 +72,6 @@ TEST_F(AddressDecoderFixture, Decoding)
|
||||
unsigned int bank = decodedAddress.bank;
|
||||
unsigned int row = decodedAddress.row;
|
||||
unsigned int column = decodedAddress.column;
|
||||
unsigned int byte = decodedAddress.byte;
|
||||
|
||||
EXPECT_EQ(channel, 0);
|
||||
EXPECT_EQ(rank, 0);
|
||||
@@ -74,7 +79,61 @@ TEST_F(AddressDecoderFixture, Decoding)
|
||||
EXPECT_EQ(bank, 12);
|
||||
EXPECT_EQ(row, 29874);
|
||||
EXPECT_EQ(column, 170);
|
||||
EXPECT_EQ(byte, 0);
|
||||
}
|
||||
|
||||
TEST_F(AddressDecoderFixture, DecodingNP2Failure)
|
||||
{
|
||||
addressMappingConfig = DRAMSys::Config::AddressMapping(nlohmann::json::parse(validAddressMappingJsonString)
|
||||
.at("addressmapping")
|
||||
.get<DRAMSys::Config::AddressMapping>());
|
||||
|
||||
auto memSpec = std::make_unique<const DRAMSys::MemSpecDDR4>(
|
||||
nlohmann::json::parse(validNP2MemSpecJsonString)
|
||||
.at("memspec").get< DRAMUtils::MemSpec::MemSpecDDR4>());
|
||||
|
||||
addressDecoder = DRAMSys::AddressDecoder(addressMappingConfig);
|
||||
addressDecoder.plausibilityCheck(*memSpec);
|
||||
|
||||
uint64_t address = 0x3A59'1478;
|
||||
tlm::tlm_generic_payload trans;
|
||||
trans.set_address(address);
|
||||
addressDecoder.decodeAddress(trans);
|
||||
EXPECT_EQ(trans.get_response_status(), tlm::TLM_ADDRESS_ERROR_RESPONSE);
|
||||
}
|
||||
|
||||
TEST_F(AddressDecoderFixture, DecodingNP2Success)
|
||||
{
|
||||
addressMappingConfig = DRAMSys::Config::AddressMapping(nlohmann::json::parse(validAddressMappingJsonString)
|
||||
.at("addressmapping")
|
||||
.get<DRAMSys::Config::AddressMapping>());
|
||||
|
||||
auto memSpec = std::make_unique<const DRAMSys::MemSpecDDR4>(
|
||||
nlohmann::json::parse(validNP2MemSpecJsonString)
|
||||
.at("memspec").get< DRAMUtils::MemSpec::MemSpecDDR4>());
|
||||
|
||||
addressDecoder = DRAMSys::AddressDecoder(addressMappingConfig);
|
||||
addressDecoder.plausibilityCheck(*memSpec);
|
||||
|
||||
uint64_t address = 0x3A59'1477;
|
||||
tlm::tlm_generic_payload trans;
|
||||
trans.set_address(address);
|
||||
trans.set_response_status(tlm::TLM_INCOMPLETE_RESPONSE);
|
||||
auto decodedAddress = addressDecoder.decodeAddress(trans);
|
||||
|
||||
unsigned int channel = decodedAddress.channel;
|
||||
unsigned int rank = decodedAddress.rank;
|
||||
unsigned int bankgroup = decodedAddress.bankgroup;
|
||||
unsigned int bank = decodedAddress.bank;
|
||||
unsigned int row = decodedAddress.row;
|
||||
unsigned int column = decodedAddress.column;
|
||||
|
||||
EXPECT_EQ(channel, 0);
|
||||
EXPECT_EQ(rank, 0);
|
||||
EXPECT_EQ(bankgroup, 1);
|
||||
EXPECT_EQ(bank, 4);
|
||||
EXPECT_EQ(row, 7468);
|
||||
EXPECT_EQ(column, 558);
|
||||
EXPECT_EQ(trans.get_response_status(), tlm::TLM_INCOMPLETE_RESPONSE);
|
||||
}
|
||||
|
||||
TEST_F(AddressDecoderFixture, Encoding)
|
||||
@@ -98,14 +157,93 @@ TEST_F(AddressDecoderFixture, DeEncoding)
|
||||
{
|
||||
std::array testAddresses{std::uint64_t(0x3A59'1474),
|
||||
std::uint64_t(0x0000'0000),
|
||||
std::uint64_t(0x2FFA'1231),
|
||||
std::uint64_t(0x0001'FFFF)};
|
||||
std::uint64_t(0x2FFA'1230),
|
||||
std::uint64_t(0x0001'FFF0)};
|
||||
|
||||
tlm::tlm_generic_payload trans;
|
||||
for (auto address : testAddresses)
|
||||
{
|
||||
DRAMSys::DecodedAddress decodedAddress = addressDecoder.decodeAddress(address);
|
||||
trans.set_address(address);
|
||||
DRAMSys::DecodedAddress decodedAddress = addressDecoder.decodeAddress(trans);
|
||||
uint64_t encodedAddress = addressDecoder.encodeAddress(decodedAddress);
|
||||
|
||||
EXPECT_EQ(encodedAddress, address);
|
||||
}
|
||||
}
|
||||
|
||||
class AddressDecoderPlausibilityFixture : public ::testing::Test
|
||||
{
|
||||
protected:
|
||||
std::unique_ptr<DRAMSys::AddressDecoder> addressDecoder = nullptr;
|
||||
std::unique_ptr<DRAMSys::MemSpecDDR4> memSpecDDR4 = nullptr;
|
||||
|
||||
void setupDecoder(const std::string_view& memSpecJson,
|
||||
const std::string_view& addressMappingJson)
|
||||
{
|
||||
DRAMUtils::MemSpec::MemSpecDDR4 memSpec =
|
||||
nlohmann::json::parse(memSpecJson).at("memspec").get< DRAMUtils::MemSpec::MemSpecDDR4>();
|
||||
memSpecDDR4 = std::make_unique<DRAMSys::MemSpecDDR4>(memSpec);
|
||||
|
||||
DRAMSys::Config::AddressMapping addressMappingConfig =
|
||||
nlohmann::json::parse(addressMappingJson)
|
||||
.at("addressmapping")
|
||||
.get<DRAMSys::Config::AddressMapping>();
|
||||
addressDecoder = std::make_unique<DRAMSys::AddressDecoder>(addressMappingConfig);
|
||||
}
|
||||
};
|
||||
|
||||
TEST_F(AddressDecoderPlausibilityFixture, ValidPlausibilityCheck)
|
||||
{
|
||||
setupDecoder(validMemSpecJsonString, validAddressMappingJsonString);
|
||||
|
||||
EXPECT_NO_THROW(addressDecoder->plausibilityCheck(*memSpecDDR4));
|
||||
}
|
||||
|
||||
TEST_F(AddressDecoderPlausibilityFixture, ValidNP2PlausibilityCheck)
|
||||
{
|
||||
setupDecoder(validNP2MemSpecJsonString, validAddressMappingJsonString);
|
||||
|
||||
EXPECT_NO_THROW(addressDecoder->plausibilityCheck(*memSpecDDR4));
|
||||
}
|
||||
|
||||
TEST_F(AddressDecoderPlausibilityFixture, InvalidMaxAddress)
|
||||
{
|
||||
setupDecoder(invalidMaxAddressMemSpecJsonString, validAddressMappingJsonString);
|
||||
|
||||
EXPECT_DEATH(addressDecoder->plausibilityCheck(*memSpecDDR4), "");
|
||||
}
|
||||
|
||||
TEST_F(AddressDecoderPlausibilityFixture, DuplicateBits)
|
||||
{
|
||||
setupDecoder(validMemSpecJsonString, addressMappingWithDuplicatesJsonString);
|
||||
|
||||
EXPECT_DEATH(addressDecoder->plausibilityCheck(*memSpecDDR4), "");
|
||||
}
|
||||
|
||||
TEST_F(AddressDecoderPlausibilityFixture, NonContinuousByteBits)
|
||||
{
|
||||
setupDecoder(validMemSpecJsonString, nonContinuousByteBitsAddressMappingJsonString);
|
||||
|
||||
EXPECT_DEATH(addressDecoder->plausibilityCheck(*memSpecDDR4), "");
|
||||
}
|
||||
|
||||
TEST_F(AddressDecoderPlausibilityFixture, InvalidChannelMapping)
|
||||
{
|
||||
setupDecoder(invalidChannelMemSpecJsonString, validAddressMappingJsonString);
|
||||
|
||||
EXPECT_DEATH(addressDecoder->plausibilityCheck(*memSpecDDR4), "");
|
||||
}
|
||||
|
||||
TEST_F(AddressDecoderPlausibilityFixture, InvalidBankGroups)
|
||||
{
|
||||
setupDecoder(invalidBankGroupMemSpecJsonString, validAddressMappingJsonString);
|
||||
|
||||
EXPECT_DEATH(addressDecoder->plausibilityCheck(*memSpecDDR4), "");
|
||||
}
|
||||
|
||||
TEST_F(AddressDecoderPlausibilityFixture, InvalidRanks)
|
||||
{
|
||||
setupDecoder(invalidRanksMemSpecJsonString, validAddressMappingJsonString);
|
||||
|
||||
EXPECT_DEATH(addressDecoder->plausibilityCheck(*memSpecDDR4), "");
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user