Gabe Black has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/42351 )
Change subject: arch-x86: Fix style and use uop args in seqop.isa.
......................................................................
arch-x86: Fix style and use uop args in seqop.isa.
Change-Id: I41ed7f0aa8dd00ed0f6f8361837945810d12bf9e
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/42351
Reviewed-by: Gabe Black <[email protected]>
Maintainer: Gabe Black <[email protected]>
Tested-by: kokoro <[email protected]>
---
M src/arch/x86/insts/microop_args.hh
M src/arch/x86/isa/microops/seqop.isa
2 files changed, 100 insertions(+), 137 deletions(-)
Approvals:
Gabe Black: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/arch/x86/insts/microop_args.hh
b/src/arch/x86/insts/microop_args.hh
index ac4d81e..6fa09f5 100644
--- a/src/arch/x86/insts/microop_args.hh
+++ b/src/arch/x86/insts/microop_args.hh
@@ -264,6 +264,22 @@
}
};
+struct UpcOp
+{
+ using ArgType = MicroPC;
+
+ MicroPC target;
+
+ template <class InstType>
+ UpcOp(InstType *inst, ArgType _target) : target(_target) {}
+
+ void
+ print(std::ostream &os) const
+ {
+ ccprintf(os, "%#x", target);
+ }
+};
+
struct FaultOp
{
using ArgType = Fault;
diff --git a/src/arch/x86/isa/microops/seqop.isa
b/src/arch/x86/isa/microops/seqop.isa
index 64f749b..7b52101 100644
--- a/src/arch/x86/isa/microops/seqop.isa
+++ b/src/arch/x86/isa/microops/seqop.isa
@@ -33,114 +33,81 @@
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-output header {{
- class SeqOpBase : public X86ISA::X86MicroopBase
- {
- protected:
- uint16_t target;
- uint8_t cc;
-
- public:
- SeqOpBase(ExtMachInst _machInst, const char * instMnem,
- const char * mnemonic, uint64_t setFlags,
- uint16_t _target, uint8_t _cc);
-
- SeqOpBase(ExtMachInst _machInst, const char * instMnem,
- const char * mnemonic,
- uint16_t _target, uint8_t _cc);
-
- std::string generateDisassembly(Addr pc,
- const Loader::SymbolTable *symtab) const override;
- };
-}};
-
-def template SeqOpDeclare {{
+def template BrDeclare {{
class %(class_name)s : public %(base_class)s
{
private:
%(reg_idx_arr_decl)s;
public:
- %(class_name)s(ExtMachInst _machInst, const char * instMnem,
- uint64_t setFlags, uint16_t _target, uint8_t _cc);
+ %(class_name)s(ExtMachInst mach_inst, const char *inst_mnem,
+ uint64_t set_flags, uint16_t _target, uint8_t _cc) :
+ %(base_class)s(mach_inst, "%(mnemonic)s", inst_mnem, set_flags,
+ %(op_class)s, _target, _cc)
+ {
+ %(set_reg_idx_arr)s;
+ %(constructor)s;
+ }
Fault execute(ExecContext *, Trace::InstRecord *) const override;
- X86ISA::PCState branchTarget(const X86ISA::PCState &branchPC) const
- override;
+ X86ISA::PCState
+ branchTarget(const X86ISA::PCState &branchPC) const override
+ {
+ X86ISA::PCState pcs = branchPC;
+ DPRINTF(X86, "Br branchTarget PC info: %s, Target: %d\n",
+ pcs, (int16_t)target);
+ pcs.nupc(target);
+ pcs.uAdvance();
+ return pcs;
+ }
/// Explicitly import the otherwise hidden branchTarget
using StaticInst::branchTarget;
};
}};
-def template SeqOpExecute {{
- Fault %(class_name)s::execute(ExecContext *xc,
- Trace::InstRecord *traceData) const
+def template EretDeclare {{
+ class %(class_name)s : public %(base_class)s
+ {
+ private:
+ %(reg_idx_arr_decl)s;
+
+ public:
+ %(class_name)s(ExtMachInst mach_inst, const char *inst_mnem,
+ uint64_t set_flags, uint8_t _cc) :
+ %(base_class)s(mach_inst, "%(mnemonic)s", inst_mnem, set_flags,
+ %(op_class)s, _cc)
{
- %(op_decl)s;
- %(op_rd)s;
- if (%(cond_test)s) {
- %(code)s;
- } else {
- %(else_code)s;
- }
- %(op_wb)s;
- return NoFault;
+ %(set_reg_idx_arr)s;
+ %(constructor)s;
}
+
+ Fault execute(ExecContext *, Trace::InstRecord *) const override;
+ };
}};
-output decoder {{
- SeqOpBase::SeqOpBase(
- ExtMachInst machInst, const char * mnemonic, const char *
instMnem,
- uint64_t setFlags, uint16_t _target, uint8_t _cc) :
- X86MicroopBase(machInst, mnemonic, instMnem, setFlags, No_OpClass),
- target(_target), cc(_cc)
+def template SeqOpExecute {{
+ Fault
+ %(class_name)s::execute(ExecContext *xc,
+ Trace::InstRecord *traceData) const
{
- }
-}};
-
-def template SeqOpConstructor {{
- %(class_name)s::%(class_name)s(
- ExtMachInst machInst, const char * instMnem,
- uint64_t setFlags, uint16_t _target, uint8_t _cc) :
- %(base_class)s(machInst, "%(mnemonic)s", instMnem,
- setFlags, _target, _cc)
- {
- %(set_reg_idx_arr)s;
- %(constructor)s;
- %(cond_control_flag_init)s;
- }
-
- X86ISA::PCState
- %(class_name)s::branchTarget(const X86ISA::PCState &branchPC) const
- {
- X86ISA::PCState pcs = branchPC;
- DPRINTF(X86, "Br branchTarget PC info: %s, Target: %d\n",
- pcs, (int16_t)target);
- pcs.nupc(target);
- pcs.uAdvance();
- return pcs;
- }
-}};
-
-output decoder {{
- std::string
- SeqOpBase::generateDisassembly(
- Addr pc, const Loader::SymbolTable *symtab) const
- {
- std::stringstream response;
-
- printMnemonic(response, instMnem, mnemonic);
- ccprintf(response, "%#x", target);
-
- return response.str();
+ %(op_decl)s;
+ %(op_rd)s;
+ if (%(cond_test)s) {
+ %(code)s;
+ } else {
+ %(else_code)s;
+ }
+ %(op_wb)s;
+ return NoFault;
}
}};
let {{
- class SeqOp(X86Microop):
+ class Br(X86Microop):
def __init__(self, target, flags=None):
+ self.className = "Br"
self.target = target
if flags:
if not isinstance(flags, (list, tuple)):
@@ -151,79 +118,59 @@
self.cond = "0"
def getAllocator(self, microFlags):
- allocator = '''new %(class_name)s(machInst, macrocodeBlock,
+ if "IsLastMicroop" in microFlags:
+ microFlags.remove("IsLastMicroop")
+ if not "IsDelayedCommit" in microFlags:
+ microFlags.append("IsDelayedCommit")
+
+ return '''new %(class_name)s(machInst, macrocodeBlock,
%(flags)s, %(target)s, %(cc)s)''' % {
"class_name" : self.className,
"flags" : self.microFlagsText(microFlags),
"target" : self.target,
"cc" : self.cond}
- return allocator
+ microopClasses["br"] = Br
- class Br(SeqOp):
- className = "MicroBranch"
-
- def getAllocator(self, microFlags):
- if "IsLastMicroop" in microFlags:
- microFlags.remove("IsLastMicroop")
- if not "IsDelayedCommit" in microFlags:
- microFlags.append("IsDelayedCommit")
- return super(Br, self).getAllocator(microFlags)
-
- class Eret(SeqOp):
- target = "normalMicroPC(0)"
- className = "Eret"
-
+ class Eret(X86Microop):
def __init__(self, flags=None):
+ self.className = "Eret"
if flags:
if not isinstance(flags, (list, tuple)):
raise Exception("flags must be a list or tuple of
flags")
self.cond = " | ".join(flags)
self.className += "Flags"
else:
- self.cond = "0"
+ self.cond = "X86ISA::ConditionTests::True"
def getAllocator(self, microFlags):
if not "IsLastMicroop" in microFlags:
microFlags.append("IsLastMicroop")
if "IsDelayedCommit" in microFlags:
microFlags.remove("IsDelayedCommit")
- return super(Eret, self).getAllocator(microFlags)
- iop = InstObjParams("br", "MicroBranchFlags", "SeqOpBase",
- {"code": "nuIP = target;",
- "else_code": "nuIP = nuIP;",
- "cond_test": "checkCondition(ccFlagBits | cfofBits | dfBit | \
- ecfBit | ezfBit, cc)",
- "cond_control_flag_init": "flags[IsCondControl] = true; \
- flags[IsDirectControl] = true;"})
- exec_output += SeqOpExecute.subst(iop)
- header_output += SeqOpDeclare.subst(iop)
- decoder_output += SeqOpConstructor.subst(iop)
- iop = InstObjParams("br", "MicroBranch", "SeqOpBase",
- {"code": "nuIP = target;",
- "else_code": "nuIP = nuIP;",
- "cond_test": "true",
- "cond_control_flag_init": ""})
- exec_output += SeqOpExecute.subst(iop)
- header_output += SeqOpDeclare.subst(iop)
- decoder_output += SeqOpConstructor.subst(iop)
- microopClasses["br"] = Br
-
- iop = InstObjParams("eret", "EretFlags", "SeqOpBase",
- {"code": "", "else_code": "",
- "cond_test": "checkCondition(ccFlagBits | cfofBits | dfBit | \
- ecfBit | ezfBit, cc)",
- "cond_control_flag_init": "flags[IsUncondControl] = true;\
- flags[IsDirectControl] = true;"})
- exec_output += SeqOpExecute.subst(iop)
- header_output += SeqOpDeclare.subst(iop)
- decoder_output += SeqOpConstructor.subst(iop)
- iop = InstObjParams("eret", "Eret", "SeqOpBase",
- {"code": "", "else_code": "",
- "cond_test": "true",
- "cond_control_flag_init": ""})
- exec_output += SeqOpExecute.subst(iop)
- header_output += SeqOpDeclare.subst(iop)
- decoder_output += SeqOpConstructor.subst(iop)
+ return '''new %(class_name)s(machInst, macrocodeBlock,
+ %(flags)s, %(cc)s)''' % {
+ "class_name" : self.className,
+ "flags" : self.microFlagsText(microFlags),
+ "cc" : self.cond}
microopClasses["eret"] = Eret
+
+ cond_code = "checkCondition(ccFlagBits | cfofBits | dfBit |" \
+ "ecfBit | ezfBit, cc)"
+ for suffix, cond, flags in \
+ ("Flags", cond_code, ["IsDirectControl", "IsCondControl"]), \
+ ("", "true", []):
+ iop = InstObjParams("br", "Br" + suffix,
+ "X86ISA::InstOperands<X86ISA::MicroCondBase,
X86ISA::UpcOp>",
+ {"code": "nuIP = target;", "else_code": "nuIP = nuIP;",
+ "cond_test": cond},
+ flags)
+ exec_output += SeqOpExecute.subst(iop)
+ header_output += BrDeclare.subst(iop)
+
+ iop = InstObjParams("eret", "Eret" + suffix,
+ "X86ISA::InstOperands<X86ISA::MicroCondBase>",
+ {"code": "", "else_code": "", "cond_test": cond}, flags)
+ exec_output += SeqOpExecute.subst(iop)
+ header_output += EretDeclare.subst(iop)
}};
8 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the
submitted one.
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/42351
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: I41ed7f0aa8dd00ed0f6f8361837945810d12bf9e
Gerrit-Change-Number: 42351
Gerrit-PatchSet: 10
Gerrit-Owner: Gabe Black <[email protected]>
Gerrit-Reviewer: Andreas Sandberg <[email protected]>
Gerrit-Reviewer: Gabe Black <[email protected]>
Gerrit-Reviewer: Giacomo Travaglini <[email protected]>
Gerrit-Reviewer: Tong Shen <[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
