From ec02455e67cccd1e660543e229ea67ce3ba2105f Mon Sep 17 00:00:00 2001 From: Finn Wilkinson Date: Mon, 4 Nov 2024 17:51:31 +0000 Subject: [PATCH] Reverted to using old-values for SVE VL and fixed AArch64 decode catch case. --- src/lib/arch/aarch64/Instruction_decode.cc | 2 +- src/lib/config/ModelConfig.cc | 3 ++- test/regression/aarch64/AArch64RegressionTest.hh | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/lib/arch/aarch64/Instruction_decode.cc b/src/lib/arch/aarch64/Instruction_decode.cc index 2d595533f..9d411195b 100644 --- a/src/lib/arch/aarch64/Instruction_decode.cc +++ b/src/lib/arch/aarch64/Instruction_decode.cc @@ -839,7 +839,7 @@ void Instruction::decode() { if (((Opcode::AArch64_FMOVD0 <= metadata_.opcode && metadata_.opcode <= Opcode::AArch64_FMOVS0) || (Opcode::AArch64_FMOVDXHighr <= metadata_.opcode && - metadata_.opcode <= Opcode::AArch64_FMOVv8f16_ns)) && + metadata_.opcode <= Opcode::AArch64_FMOVXHr)) && !(isInstruction(InsnType::isScalarData) || isInstruction(InsnType::isVectorData))) { setInstructionType(InsnType::isScalarData); diff --git a/src/lib/config/ModelConfig.cc b/src/lib/config/ModelConfig.cc index 71833b903..fe6975c02 100644 --- a/src/lib/config/ModelConfig.cc +++ b/src/lib/config/ModelConfig.cc @@ -370,7 +370,8 @@ void ModelConfig::setExpectations(bool isDefault) { expectations_["Core"].addChild(ExpectationNode::createExpectation( 128, "Vector-Length", true)); expectations_["Core"]["Vector-Length"].setValueSet( - std::vector{128, 256, 512, 1024, 2048}); + std::vector{128, 256, 384, 512, 640, 768, 896, 1024, 1152, + 1280, 1408, 1536, 1664, 1792, 1920, 2048}); expectations_["Core"].addChild(ExpectationNode::createExpectation( 128, "Streaming-Vector-Length", true)); diff --git a/test/regression/aarch64/AArch64RegressionTest.hh b/test/regression/aarch64/AArch64RegressionTest.hh index bef7ca560..32d975b09 100644 --- a/test/regression/aarch64/AArch64RegressionTest.hh +++ b/test/regression/aarch64/AArch64RegressionTest.hh @@ -77,7 +77,7 @@ inline std::string paramToString( inline std::vector> genCoreTypeVLPairs( CoreType type) { std::vector> coreVLPairs; - for (uint64_t i = 128; i <= 2048; i *= 2) { + for (uint64_t i = 128; i <= 2048; i += 128) { coreVLPairs.push_back(std::make_tuple( type, "{Core: {Vector-Length: " + std::to_string(i) +