Gabe Black has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/48717 )
(
1 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the
submitted one.
)Change subject: sparc: Stop using fp_enable_check.
......................................................................
sparc: Stop using fp_enable_check.
SPARC and MIPS are the only ISAs using this mechanism. This is a step
towards making them self sufficient and simplifying the ISA parser, it's
interface to the rest of gem5, and it's assumptions about how ISAs are
structured.
Change-Id: Ied85d5012a806321fd717f654d940171da3450af
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/48717
Tested-by: kokoro <[email protected]>
Reviewed-by: Boris Shingarov <[email protected]>
Maintainer: Gabe Black <[email protected]>
---
M src/arch/sparc/isa/formats/mem/util.isa
M src/arch/sparc/isa/formats/mem/basicmem.isa
M src/arch/sparc/isa/formats/mem/blockmem.isa
M src/arch/sparc/isa/formats/mem/swap.isa
M src/arch/sparc/isa/decoder.isa
M src/arch/sparc/isa/formats/basic.isa
M src/arch/sparc/isa/base.isa
7 files changed, 122 insertions(+), 20 deletions(-)
Approvals:
Boris Shingarov: Looks good to me, approved
Gabe Black: Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/arch/sparc/isa/base.isa b/src/arch/sparc/isa/base.isa
index 9adc5ee..8b118f4 100644
--- a/src/arch/sparc/isa/base.isa
+++ b/src/arch/sparc/isa/base.isa
@@ -123,10 +123,9 @@
/// @retval Full-system mode: NoFault if FP is enabled, FpDisabled
/// if not.
static inline Fault
- checkFpEnableFault(ExecContext *xc)
+ checkFpEnabled(PSTATE pstate, RegVal fprs)
{
- PSTATE pstate = xc->readMiscReg(MISCREG_PSTATE);
- if (pstate.pef && xc->readMiscReg(MISCREG_FPRS) & 0x4) {
+ if (pstate.pef && fprs & 0x4) {
return NoFault;
} else {
return std::make_shared<FpDisabled>();
diff --git a/src/arch/sparc/isa/decoder.isa b/src/arch/sparc/isa/decoder.isa
index 9c85cdf..7296c1a 100644
--- a/src/arch/sparc/isa/decoder.isa
+++ b/src/arch/sparc/isa/decoder.isa
@@ -1258,7 +1258,7 @@
}}, MEM_SWAP);
format Trap {
- 0x20: Load::ldf({{Frds_uw = Mem_uw;}});
+ 0x20: Loadf::ldf({{Frds_uw = Mem_uw;}});
0x21: decode RD {
0x0: Load::ldfsr({{fault = checkFpEnableFault(xc);
if (fault)
@@ -1271,8 +1271,8 @@
default: FailUnimpl::ldfsrOther();
}
0x22: ldqf({{fault = std::make_shared<FpDisabled>();}});
- 0x23: Load::lddf({{Frd_udw = Mem_udw;}});
- 0x24: Store::stf({{Mem_uw = Frds_uw;}});
+ 0x23: Loadf::lddf({{Frd_udw = Mem_udw;}});
+ 0x24: Storef::stf({{Mem_uw = Frds_uw;}});
0x25: decode RD {
0x0: StoreFsr::stfsr({{fault = checkFpEnableFault(xc);
if (fault)
@@ -1285,11 +1285,11 @@
default: FailUnimpl::stfsrOther();
}
0x26: stqf({{fault = std::make_shared<FpDisabled>();}});
- 0x27: Store::stdf({{Mem_udw = Frd_udw;}});
+ 0x27: Storef::stdf({{Mem_udw = Frd_udw;}});
0x2D: Nop::prefetch();
- 0x30: LoadAlt::ldfa({{Frds_uw = Mem_uw;}});
+ 0x30: LoadfAlt::ldfa({{Frds_uw = Mem_uw;}});
0x32: ldqfa({{fault = std::make_shared<FpDisabled>();}});
- format LoadAlt {
+ format LoadfAlt {
0x33: decode EXT_ASI {
// ASI_NUCLEUS
0x04: FailUnimpl::lddfa_n();
@@ -1328,7 +1328,7 @@
// ASI_SECONDARY_NO_FAULT_LITTLE
0x8B: FailUnimpl::lddfa_snfl();
- format BlockLoad {
+ format BlockLoadf {
// LDBLOCKF
// ASI_BLOCK_AS_IF_USER_PRIMARY
0x16: FailUnimpl::ldblockf_aiup();
@@ -1370,9 +1370,9 @@
{{fault =
std::make_shared<DataAccessException>();}});
}
}
- 0x34: Store::stfa({{Mem_uw = Frds_uw;}});
+ 0x34: Storef::stfa({{Mem_uw = Frds_uw;}});
0x36: stqfa({{fault = std::make_shared<FpDisabled>();}});
- format StoreAlt {
+ format StorefAlt {
0x37: decode EXT_ASI {
// ASI_NUCLEUS
0x04: FailUnimpl::stdfa_n();
@@ -1411,7 +1411,7 @@
// ASI_SECONDARY_NO_FAULT_LITTLE
0x8B: FailUnimpl::stdfa_snfl();
- format BlockStore {
+ format BlockStoref {
// STBLOCKF
// ASI_BLOCK_AS_IF_USER_PRIMARY
0x16: FailUnimpl::stblockf_aiup();
diff --git a/src/arch/sparc/isa/formats/basic.isa
b/src/arch/sparc/isa/formats/basic.isa
index e0441b3..0d2346d 100644
--- a/src/arch/sparc/isa/formats/basic.isa
+++ b/src/arch/sparc/isa/formats/basic.isa
@@ -104,6 +104,25 @@
{
Fault fault = NoFault;
+ %(op_decl)s;
+ %(op_rd)s;
+ %(code)s;
+
+ if (fault == NoFault) {
+ %(op_wb)s;
+ }
+ return fault;
+}
+}};
+
+// Basic instruction class execute method template.
+def template FpExecute {{
+Fault
+%(class_name)s::execute(ExecContext *xc,
+ Trace::InstRecord *traceData) const
+{
+ Fault fault = NoFault;
+
%(fp_enable_check)s;
%(op_decl)s;
%(op_rd)s;
@@ -152,6 +171,10 @@
}};
+let {{
+ fp_enabled = 'fault = checkFpEnabled(Pstate, Fprs);'
+}};
+
def format FpBasic(code, *flags) {{
exec_code = """
Fsr |= bits(Fsr, 4, 0) << 5;
@@ -181,7 +204,9 @@
"""
fp_code = filterDoubles(code)
iop = InstObjParams(name, Name, 'SparcStaticInst',
- { "code" : exec_code, "fp_code" : fp_code }, flags)
+ { "code" : exec_code,
+ "fp_code" : fp_code,
+ "fp_enabled" : fp_enabled }, flags)
header_output = FpBasicDeclare.subst(iop)
decoder_output = BasicConstructor.subst(iop)
decode_block = BasicDecode.subst(iop)
diff --git a/src/arch/sparc/isa/formats/mem/basicmem.isa
b/src/arch/sparc/isa/formats/mem/basicmem.isa
index 0354478..83377ae 100644
--- a/src/arch/sparc/isa/formats/mem/basicmem.isa
+++ b/src/arch/sparc/isa/formats/mem/basicmem.isa
@@ -83,6 +83,16 @@
AlternateASIPrivFaultCheck, name, Name, "EXT_ASI", opt_flags)
}};
+def format LoadfAlt(code, *opt_flags) {{
+ code = filterDoubles(code)
+ (header_output,
+ decoder_output,
+ exec_output,
+ decode_block) = doMemFormat(code, LoadFuncs,
+ AlternateASIPrivFaultCheck + fp_enabled, name, Name, "EXT_ASI",
+ opt_flags)
+}};
+
def format StoreAlt(code, *opt_flags) {{
code = filterDoubles(code)
(header_output,
@@ -92,6 +102,16 @@
AlternateASIPrivFaultCheck, name, Name, "EXT_ASI", opt_flags)
}};
+def format StorefAlt(code, *opt_flags) {{
+ code = filterDoubles(code)
+ (header_output,
+ decoder_output,
+ exec_output,
+ decode_block) = doMemFormat(code, StoreFuncs,
+ AlternateASIPrivFaultCheck + fp_enabled, name, Name, "EXT_ASI",
+ opt_flags)
+}};
+
def format Load(code, *opt_flags) {{
code = filterDoubles(code)
(header_output,
@@ -101,6 +121,15 @@
LoadFuncs, '', name, Name, 0, opt_flags)
}};
+def format Loadf(code, *opt_flags) {{
+ code = filterDoubles(code)
+ (header_output,
+ decoder_output,
+ exec_output,
+ decode_block) = doMemFormat(code,
+ LoadFuncs, fp_enabled, name, Name, 0, opt_flags)
+}};
+
def format Store(code, *opt_flags) {{
code = filterDoubles(code)
(header_output,
@@ -110,6 +139,15 @@
StoreFuncs, '', name, Name, 0, opt_flags)
}};
+def format Storef(code, *opt_flags) {{
+ code = filterDoubles(code)
+ (header_output,
+ decoder_output,
+ exec_output,
+ decode_block) = doMemFormat(code,
+ StoreFuncs, fp_enabled, name, Name, 0, opt_flags)
+}};
+
def format StoreFsr(code, *opt_flags) {{
code = filterDoubles(code)
(header_output,
diff --git a/src/arch/sparc/isa/formats/mem/blockmem.isa
b/src/arch/sparc/isa/formats/mem/blockmem.isa
index fb9cfc4..3ae0820 100644
--- a/src/arch/sparc/isa/formats/mem/blockmem.isa
+++ b/src/arch/sparc/isa/formats/mem/blockmem.isa
@@ -165,6 +165,20 @@
LoadFuncs, name, Name, opt_flags)
}};
+def format BlockLoadf(code, *opt_flags) {{
+ code = filterDoubles(code)
+ # We need to make sure to check the highest priority fault last.
+ # That way, if other faults have been detected, they'll be
overwritten
+ # rather than the other way around.
+ faultCode = AlternateASIPrivFaultCheck + BlockAlignmentFaultCheck
+ \
+ fp_enabled
+ (header_output,
+ decoder_output,
+ exec_output,
+ decode_block) = doBlockMemFormat(code, faultCode,
+ LoadFuncs, name, Name, opt_flags)
+}};
+
def format BlockStore(code, *opt_flags) {{
code = filterDoubles(code)
# We need to make sure to check the highest priority fault last.
@@ -177,3 +191,17 @@
decode_block) = doBlockMemFormat(code, faultCode,
StoreFuncs, name, Name, opt_flags)
}};
+
+def format BlockStoref(code, *opt_flags) {{
+ code = filterDoubles(code)
+ # We need to make sure to check the highest priority fault last.
+ # That way, if other faults have been detected, they'll be
overwritten
+ # rather than the other way around.
+ faultCode = AlternateASIPrivFaultCheck + BlockAlignmentFaultCheck
+ \
+ fp_enabled
+ (header_output,
+ decoder_output,
+ exec_output,
+ decode_block) = doBlockMemFormat(code, faultCode,
+ StoreFuncs, name, Name, opt_flags)
+}};
diff --git a/src/arch/sparc/isa/formats/mem/swap.isa
b/src/arch/sparc/isa/formats/mem/swap.isa
index ef13385..62348b4 100644
--- a/src/arch/sparc/isa/formats/mem/swap.isa
+++ b/src/arch/sparc/isa/formats/mem/swap.isa
@@ -34,7 +34,6 @@
// It should be optomized out in all the others
bool storeCond = true;
Addr EA;
- %(fp_enable_check)s;
%(op_decl)s;
uint64_t mem_data = 0;
@@ -70,7 +69,6 @@
{
Fault fault = NoFault;
Addr EA;
- %(fp_enable_check)s;
uint64_t mem_data = 0;
%(op_decl)s;
%(op_rd)s;
diff --git a/src/arch/sparc/isa/formats/mem/util.isa
b/src/arch/sparc/isa/formats/mem/util.isa
index da2a4f9..82387e2 100644
--- a/src/arch/sparc/isa/formats/mem/util.isa
+++ b/src/arch/sparc/isa/formats/mem/util.isa
@@ -36,7 +36,6 @@
{
Fault fault = NoFault;
Addr EA;
- %(fp_enable_check)s;
%(op_decl)s;
%(op_rd)s;
%(ea_code)s;
@@ -64,7 +63,6 @@
{
Fault fault = NoFault;
Addr EA;
- %(fp_enable_check)s;
%(op_decl)s;
%(op_rd)s;
%(ea_code)s;
@@ -104,7 +102,6 @@
// It should be optomized out in all the others
bool storeCond = true;
Addr EA;
- %(fp_enable_check)s;
%(op_decl)s;
%(op_rd)s;
%(ea_code)s;
@@ -134,7 +131,6 @@
Fault fault = NoFault;
bool storeCond = true;
Addr EA;
- %(fp_enable_check)s;
%(op_decl)s;
%(op_rd)s;
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/48717
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: Ied85d5012a806321fd717f654d940171da3450af
Gerrit-Change-Number: 48717
Gerrit-PatchSet: 3
Gerrit-Owner: Gabe Black <[email protected]>
Gerrit-Reviewer: Bobby R. Bruce <[email protected]>
Gerrit-Reviewer: Boris Shingarov <[email protected]>
Gerrit-Reviewer: Daniel Carvalho <[email protected]>
Gerrit-Reviewer: Gabe Black <[email protected]>
Gerrit-Reviewer: kokoro <[email protected]>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list -- [email protected]
To unsubscribe send an email to [email protected]
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
