From a646ed229befdae8e15dd0aba27f56c35c589e1d Mon Sep 17 00:00:00 2001 From: Elliot Baptist Date: Tue, 16 Apr 2024 16:04:09 +0100 Subject: [PATCH] Create capcache64 test, change capcache to RV32 The capcache test was using RV64 instructions without requiring `has_xlen_64`. Create a new test called capcache64 that checks for and uses the RV64 instructions. Change capcache to only use RV32 instructions by changing generators from `gen_rv64_Xcheri_cache` to `gen_rv32_Xcheri_cache`. This follows the same pattern as the float and float64 tests. --- src/QuickCheckVEngine/Main.hs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/QuickCheckVEngine/Main.hs b/src/QuickCheckVEngine/Main.hs index 80253dc..44d5aa5 100644 --- a/src/QuickCheckVEngine/Main.hs +++ b/src/QuickCheckVEngine/Main.hs @@ -259,7 +259,8 @@ allTests = [ , ("caparith", "Xcheri Extension Capability Arithmetic Verification", has_cheri, T.repeatTillEnd genCHERIarithmetic) , ("capmisc", "Xcheri Extension Capability Miscellaneous Verification", has_cheri, T.repeatTillEnd genCHERImisc) , ("capcontrol", "Xcheri Extension Capability Control Flow Verification", has_cheri, T.repeatTillEnd genCHERIcontrol) - , ("capcache", "Xcheri Extension Cache Verification", has_cheri, T.repeatTillEnd gen_rv64_Xcheri_cache) + , ("capcache", "Xcheri Extension Cache Verification", has_cheri, T.repeatTillEnd gen_rv32_Xcheri_cache) + , ("capcache64", "RV64 Xcheri Extension Cache Verification", andPs [has_cheri, has_xlen_64], T.repeatTillEnd gen_rv64_Xcheri_cache) , ("capdecode", "Xcheri Extension Capability Decode Template", has_cheri, T.repeatTillEnd capDecodeTest) , ("cloadtags", "Xcheri Extension CLoadTags Template", andPs [has_cheri, not . has_nocloadtags], T.repeatTillEnd cLoadTagsTest) , ("caprandom", "Xcheri Extension Random Template", has_cheri, randomCHERITest)