Skip to content

Commit

Permalink
X87 Code Refactoring and Optimization Pass
Browse files Browse the repository at this point in the history
  • Loading branch information
@pmatos
pmatos committed Jul 19, 2024
1 parent 17a55fb commit 5c5c921
Show file tree
Hide file tree
Showing 12 changed files with 1,827 additions and 1,378 deletions.
1 change: 1 addition & 0 deletions FEXCore/Source/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,7 @@ set (SRCS
Interface/IR/Passes/RedundantFlagCalculationElimination.cpp
Interface/IR/Passes/DeadStoreElimination.cpp
Interface/IR/Passes/RegisterAllocationPass.cpp
Interface/IR/Passes/x87StackOptimizationPass.cpp
Utils/Telemetry.cpp
Utils/Threads.cpp
Utils/Profiler.cpp
Expand Down
131 changes: 66 additions & 65 deletions FEXCore/Source/Interface/Core/OpcodeDispatcher.cpp
View file

Large diffs are not rendered by default.

67 changes: 32 additions & 35 deletions FEXCore/Source/Interface/Core/OpcodeDispatcher.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -731,45 +731,42 @@ class OpDispatchBuilder final : public IREmitter {
void VZEROOp(OpcodeArgs);

// X87 Ops
Ref ReconstructFSW();
Ref ReconstructFSW_Helper(Ref T = nullptr);
// Returns new x87 stack top from FSW.
Ref ReconstructX87StateFromFSW(Ref FSW);
void FLD(OpcodeArgs, size_t width);
void FLD_Const(OpcodeArgs, NamedVectorConstant constant);
Ref ReconstructX87StateFromFSW_Helper(Ref FSW);
void FLD(OpcodeArgs, size_t Width);
void FLDFromStack(OpcodeArgs);
void FLD_Const(OpcodeArgs, NamedVectorConstant Constant);

void FBLD(OpcodeArgs);
void FBSTP(OpcodeArgs);

void FILD(OpcodeArgs);

void FSTWithWidth(OpcodeArgs, size_t width);

void FST(OpcodeArgs);
void FST(OpcodeArgs, size_t Width);
void FSTToStack(OpcodeArgs);

void FIST(OpcodeArgs, bool Truncate);

// OpResult is used for Stack operations,
// describes if the result of the operation is stored in ST(0) or ST(i),
// where ST(i) is one of the arguments to the operation.
enum class OpResult {
RES_ST0,
RES_STI,
};
void FADD(OpcodeArgs, size_t width, bool Integer, OpResult ResInST0);
void FMUL(OpcodeArgs, size_t width, bool Integer, OpResult ResInST0);
void FDIV(OpcodeArgs, size_t width, bool Integer, bool reverse, OpResult ResInST0);
void FSUB(OpcodeArgs, size_t width, bool Integer, bool reverse, OpResult ResInST0);
void FCHS(OpcodeArgs);
void FABS(OpcodeArgs);

void X87OpHelper(OpcodeArgs, FEXCore::IR::IROps IROp, bool ZeroC2);
void FADD(OpcodeArgs, size_t Width, bool Integer, OpResult ResInST0);
void FMUL(OpcodeArgs, size_t Width, bool Integer, OpResult ResInST0);
void FDIV(OpcodeArgs, size_t Width, bool Integer, bool Reverse, OpResult ResInST0);
void FSUB(OpcodeArgs, size_t Width, bool Integer, bool Reverse, OpResult ResInST0);
void FTST(OpcodeArgs);
void FRNDINT(OpcodeArgs);
void FXTRACT(OpcodeArgs);
void FNINIT(OpcodeArgs);

void X87UnaryOp(OpcodeArgs, FEXCore::IR::IROps IROp);
void X87BinaryOp(OpcodeArgs, FEXCore::IR::IROps IROp);
void X87ModifySTP(OpcodeArgs, bool Inc);
void X87SinCos(OpcodeArgs);
void X87FYL2X(OpcodeArgs);
void X87TAN(OpcodeArgs);
void X87ATAN(OpcodeArgs);
void X87FYL2X(OpcodeArgs, bool IsFYL2XP1);
void X87LDENV(OpcodeArgs);
void X87FLDCW(OpcodeArgs);
void X87FNSTENV(OpcodeArgs);
Expand All @@ -789,27 +786,25 @@ class OpDispatchBuilder final : public IREmitter {
FLAGS_X87,
FLAGS_RFLAGS,
};
void FCOMI(OpcodeArgs, size_t width, bool Integer, FCOMIFlags whichflags, bool poptwice);
void FCOMI(OpcodeArgs, size_t Width, bool Integer, FCOMIFlags WhichFlags, bool PopTwice);

// F64 X87 Ops
void FLDF64(OpcodeArgs, size_t width);
void FLDF64_Const(OpcodeArgs, uint64_t num);
void FLDF64(OpcodeArgs, size_t Width);
void FLDF64_Const(OpcodeArgs, uint64_t Num);

void FBLDF64(OpcodeArgs);
void FBSTPF64(OpcodeArgs);

void FILDF64(OpcodeArgs);

void FSTF64WithWidth(OpcodeArgs, size_t width);

void FSTF64(OpcodeArgs);
void FSTF64(OpcodeArgs, size_t Width);

void FISTF64(OpcodeArgs, bool Truncate);

void FADDF64(OpcodeArgs, size_t width, bool Integer, OpResult ResInST0);
void FMULF64(OpcodeArgs, size_t width, bool Integer, OpResult ResInST0);
void FDIVF64(OpcodeArgs, size_t width, bool Integer, bool reverse, OpResult ResInST0);
void FSUBF64(OpcodeArgs, size_t width, bool Integer, bool reverse, OpResult ResInST0);
void FADDF64(OpcodeArgs, size_t Width, bool Integer, OpResult ResInST0);
void FMULF64(OpcodeArgs, size_t Width, bool Integer, OpResult ResInST0);
void FDIVF64(OpcodeArgs, size_t Width, bool Integer, bool Reverse, OpResult ResInST0);
void FSUBF64(OpcodeArgs, size_t Width, bool Integer, bool Reverse, OpResult ResInST0);
void FCHSF64(OpcodeArgs);
void FABSF64(OpcodeArgs);
void FTSTF64(OpcodeArgs);
Expand All @@ -821,7 +816,6 @@ class OpDispatchBuilder final : public IREmitter {
void X87BinaryOpF64(OpcodeArgs, FEXCore::IR::IROps IROp);
void X87SinCosF64(OpcodeArgs);
void X87FLDCWF64(OpcodeArgs);
void X87FYL2XF64(OpcodeArgs);
void X87TANF64(OpcodeArgs);
void X87ATANF64(OpcodeArgs);
void X87FNSAVEF64(OpcodeArgs);
Expand Down Expand Up @@ -1321,6 +1315,8 @@ class OpDispatchBuilder final : public IREmitter {
}

private:
FEX_CONFIG_OPT(ReducedPrecisionMode, X87REDUCEDPRECISION);

struct JumpTargetInfo {
Ref BlockEntry;
bool HaveEmitted;
Expand Down Expand Up @@ -1960,7 +1956,11 @@ class OpDispatchBuilder final : public IREmitter {
// First, set flags according to Arm FCMP.
HandleNZCVWrite();
_FCmp(ElementSize, Src1, Src2);
ComissFlags(InvalidateAF);
}

// Sets flags for a COMISS instruction
void ComissFlags(bool InvalidateAF = false) {
// Now set COMISS flags by converts NZCV from the Arm representation to an
// eXternal representation that's totally not a euphemism for x86, nuh-uh.
if (CTX->HostFeatures.SupportsFlagM2) {
Expand Down Expand Up @@ -2260,12 +2260,9 @@ class OpDispatchBuilder final : public IREmitter {
/** @} */

Ref GetX87Top();
void SetX87ValidTag(Ref Value, bool Valid);
Ref GetX87ValidTag(Ref Value);
Ref GetX87Tag(Ref Value, Ref AbridgedFTW);
Ref GetX87Tag(Ref Value);
void SetX87FTW(Ref FTW);
Ref GetX87FTW();
Ref GetX87FTW_Helper();
void SetX87Top(Ref Value);

bool DestIsLockedMem(FEXCore::X86Tables::DecodedOp Op) const {
Expand Down
4 changes: 2 additions & 2 deletions FEXCore/Source/Interface/Core/OpcodeDispatcher/Vector.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2513,7 +2513,7 @@ void OpDispatchBuilder::SaveX87State(OpcodeArgs, Ref MemBase) {
_StoreMem(GPRClass, 2, MemBase, FCW, 2);
}

{ _StoreMem(GPRClass, 2, ReconstructFSW(), MemBase, _Constant(2), 2, MEM_OFFSET_SXTX, 1); }
{ _StoreMem(GPRClass, 2, ReconstructFSW_Helper(), MemBase, _Constant(2), 2, MEM_OFFSET_SXTX, 1); }

{
// Abridged FTW
Expand Down Expand Up @@ -2687,7 +2687,7 @@ void OpDispatchBuilder::RestoreX87State(Ref MemBase) {

{
auto NewFSW = _LoadMem(GPRClass, 2, MemBase, _Constant(2), 2, MEM_OFFSET_SXTX, 1);
ReconstructX87StateFromFSW(NewFSW);
ReconstructX87StateFromFSW_Helper(NewFSW);
}

{
Expand Down
Loading

0 comments on commit 5c5c921

Please sign in to comment.