Skip to content

Commit

Permalink
Vif: Don't reserve regs for unused columns
Browse files Browse the repository at this point in the history 
We can reuse those for other purposes
  • Loading branch information
@TheLastRar @F0bes
TheLastRar authored and F0bes committed Feb 2, 2025
1 parent 6334082 commit 29a98f3
Show file tree
Hide file tree
Showing 3 changed files with 82 additions and 68 deletions.
140 changes: 78 additions & 62 deletions pcsx2/x86/Vif_Dynarec.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,18 +51,18 @@ __fi void VifUnpackSSE_Dynarec::SetMasks(int cS) const

if ((doMask && m2) || doMode)
{
xMOVAPS(xmmRow, ptr128[&vif.MaskRow]);
xMOVAPS(rowReg, ptr128[&vif.MaskRow]);
MSKPATH3_LOG("Moving row");
}

if (doMask && m3)
{
VIF_LOG("Merging Cols");
xMOVAPS(xmmCol0, ptr128[&vif.MaskCol]);
if ((cS >= 2) && (m3 & 0x0000ff00)) xPSHUF.D(xmmCol1, xmmCol0, _v1);
if ((cS >= 3) && (m3 & 0x00ff0000)) xPSHUF.D(xmmCol2, xmmCol0, _v2);
if ((cS >= 4) && (m3 & 0xff000000)) xPSHUF.D(xmmCol3, xmmCol0, _v3);
if ((cS >= 1) && (m3 & 0x000000ff)) xPSHUF.D(xmmCol0, xmmCol0, _v0);
xMOVAPS(colRegs[0], ptr128[&vif.MaskCol]);
if ((cS >= 2) && (m3 & 0x0000ff00)) xPSHUF.D(colRegs[1], colRegs[0], _v1);
if ((cS >= 3) && (m3 & 0x00ff0000)) xPSHUF.D(colRegs[2], colRegs[0], _v2);
if ((cS >= 4) && (m3 & 0xff000000)) xPSHUF.D(colRegs[3], colRegs[0], _v3);
if ((cS >= 1) && (m3 & 0x000000ff)) xPSHUF.D(colRegs[0], colRegs[0], _v0);
}
//if (doMask||doMode) loadRowCol((nVifStruct&)v);
}
Expand All @@ -83,12 +83,12 @@ void VifUnpackSSE_Dynarec::doMaskWrite(const xRegisterSSE& regX) const

if (doMask && m2) // Merge MaskRow
{
mVUmergeRegs(regX, xmmRow, m2);
mVUmergeRegs(regX, rowReg, m2);
}

if (doMask && m3) // Merge MaskCol
{
mVUmergeRegs(regX, xRegisterSSE(xmmCol0.Id + cc), m3);
mVUmergeRegs(regX, colRegs[cc], m3);
}

if (doMode)
Expand All @@ -102,28 +102,28 @@ void VifUnpackSSE_Dynarec::doMaskWrite(const xRegisterSSE& regX) const
{
if (doMode == 3)
{
mVUmergeRegs(xmmRow, regX, m5);
mVUmergeRegs(rowReg, regX, m5);
}
else
{
xPXOR(xmmTemp, xmmTemp);
mVUmergeRegs(xmmTemp, xmmRow, m5);
xPADD.D(regX, xmmTemp);
xPXOR(tmpReg, tmpReg);
mVUmergeRegs(tmpReg, rowReg, m5);
xPADD.D(regX, tmpReg);
if (doMode == 2)
mVUmergeRegs(xmmRow, regX, m5);
mVUmergeRegs(rowReg, regX, m5);
}
}
else
{
if (doMode == 3)
{
xMOVAPS(xmmRow, regX);
xMOVAPS(rowReg, regX);
}
else
{
xPADD.D(regX, xmmRow);
xPADD.D(regX, rowReg);
if (doMode == 2)
xMOVAPS(xmmRow, regX);
xMOVAPS(rowReg, regX);
}
}
}
Expand All @@ -137,7 +137,7 @@ void VifUnpackSSE_Dynarec::doMaskWrite(const xRegisterSSE& regX) const
void VifUnpackSSE_Dynarec::writeBackRow() const
{
const int idx = v.idx;
xMOVAPS(ptr128[&(MTVU_VifX.MaskRow)], xmmRow);
xMOVAPS(ptr128[&(MTVU_VifX.MaskRow)], rowReg);

VIF_LOG("nVif: writing back row reg! [doMode = %d]", doMode);
}
Expand Down Expand Up @@ -262,39 +262,69 @@ void VifUnpackSSE_Dynarec::CompileRoutine()
const u32 m0 = vB.mask;
const u32 m3 = ((m0 & 0xaaaaaaaa) >> 1) & ~m0;
const u32 m2 = (m0 & 0x55555555) & (~m0 >> 1);
const bool needXmmRow = ((doMask && m2) || doMode);
// see doMaskWrite()
const u32 m4 = (m0 & ~((m3 << 1) | m2)) & 0x55555555;
const u32 m5 = ~(m2 | m3 | m4) & 0x0f0f0f0f;
const bool needXmmTemp = doMode && (doMode != 3) && doMask && m5 != 0x0f0f0f0f;

// Backup non-volatile registers if needed
if (needXmmZero || needXmmRow || needXmmTemp)
int regsUsed = 2;
// Allocate column registers
if (doMask && m3)
{
int toBackup = 0;
if (needXmmRow)
toBackup++;
if (needXmmTemp)
toBackup++;
if (needXmmZero)
toBackup++;

xSUB(rsp, 8 + 16 * toBackup);

int idx = 0;
if (needXmmRow)
{
xMOVAPS(ptr128[rsp], xmmRow); // xmm6
idx++;
}
if (needXmmTemp)
{
xMOVAPS(ptr128[rsp + 16 * idx], xmmTemp); // xmm7
idx++;
}
if (needXmmZero)
xMOVAPS(ptr128[rsp + 16 * idx], zeroReg); // xmm15
colRegs[0] = xRegisterSSE(regsUsed++);

const int cS = isFill ? blockSize : cycleSize;
if ((cS >= 2) && (m3 & 0x0000ff00))
colRegs[1] = xRegisterSSE(regsUsed++);
if ((cS >= 3) && (m3 & 0x00ff0000))
colRegs[2] = xRegisterSSE(regsUsed++);
if ((cS >= 4) && (m3 & 0xff000000))
colRegs[3] = xRegisterSSE(regsUsed++);
// Column 0 already accounted for
}

std::array<xRegisterSSE, 3> nonVolatileRegs;

// Allocate row register
if ((doMask && m2) || doMode)
{
if (regsUsed - 6 >= 0)
nonVolatileRegs[regsUsed - 6] = rowReg;
rowReg = xRegisterSSE(regsUsed++);
}

// Allocate temp register
if (doMode && (doMode != 3) &&
doMask && m5 != 0x0f0f0f0f)
{
if (regsUsed - 6 >= 0)
nonVolatileRegs[regsUsed - 6] = tmpReg;
tmpReg = xRegisterSSE(regsUsed++);
}

// Allocate zero register
if (needXmmZero)
{
if (regsUsed - 6 >= 0)
nonVolatileRegs[regsUsed - 6] = zeroReg;
zeroReg = xRegisterSSE(regsUsed++);
}

regsUsed -= 6;
// Backup non-volatile registers if needed
if (regsUsed > 0)
{
xSUB(rsp, 8 + 16 * regsUsed);
for (int i = 0; i < regsUsed; i++)
xMOVAPS(ptr128[rsp + 16 * i], nonVolatileRegs[i]);
}
#else
colRegs[0] = xmm2;
colRegs[1] = xmm3;
colRegs[2] = xmm4;
colRegs[3] = xmm5;
rowReg = xmm6;
tmpReg = xmm7;
// zeroReg already set;
#endif

// Value passed determines # of col regs we need to load
Expand Down Expand Up @@ -352,25 +382,11 @@ void VifUnpackSSE_Dynarec::CompileRoutine()

#ifdef _WIN32
// Restore non-volatile registers
if (needXmmZero || needXmmRow || needXmmTemp)
if (regsUsed > 0)
{
int toRestore = 0;
if (needXmmRow)
{
xMOVAPS(xmmRow, ptr128[rsp]); // xmm6
toRestore++;
}
if (needXmmTemp)
{
xMOVAPS(xmmTemp, ptr128[rsp + 16 * toRestore]); // xmm7
toRestore++;
}
if (needXmmZero)
{
xMOVAPS(zeroReg, ptr128[rsp + 16 * toRestore]); // xmm15
toRestore++;
}
xADD(rsp, 8 + 16 * toRestore);
for (int i = 0; i < regsUsed; i++)
xMOVAPS(nonVolatileRegs[i], ptr128[rsp + 16 * i]);
xADD(rsp, 8 + 16 * regsUsed);
}
#endif

Expand Down
4 changes: 4 additions & 0 deletions pcsx2/x86/Vif_UnpackSSE.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,10 @@ class VifUnpackSSE_Dynarec : public VifUnpackSSE_Base
const nVifBlock& vB; // some pre-collected data from VifStruct
int vCL; // internal copy of vif->cl

std::array<xRegisterSSE, 4> colRegs;
xRegisterSSE rowReg;
xRegisterSSE tmpReg;

public:
VifUnpackSSE_Dynarec(const nVifStruct& vif_, const nVifBlock& vifBlock_);
VifUnpackSSE_Dynarec(const VifUnpackSSE_Dynarec& src) // copy constructor
Expand Down
6 changes: 0 additions & 6 deletions pcsx2/x86/newVif.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,3 @@ extern void mVUsaveReg(const xRegisterSSE& reg, xAddressVoid ptr, int xyzw, boo
#define _v1 0x55
#define _v2 0xaa
#define _v3 0xff
#define xmmCol0 xmm2
#define xmmCol1 xmm3
#define xmmCol2 xmm4
#define xmmCol3 xmm5
#define xmmRow xmm6
#define xmmTemp xmm7

0 comments on commit 29a98f3

Please sign in to comment.