ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GS: Use MultiISA ProcessorFeatures struct for SW codegen

This commit is contained in:
TellowKrinkle 2022-03-20 01:49:42 -05:00 committed by TellowKrinkle
parent 75da9809e9
commit a45f674bc1
10 changed files with 17 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pcsx2/GS/Renderers/Common/GSFunctionMap.h
View File

@ -20,8 +20,6 @@
#include "GS/Renderers/SW/GSScanlineEnvironment.h"
#include "common/emitter/tools.h"
#include <xbyak/xbyak_util.h>
template <class KEY, class VALUE>
class GSFunctionMap
{
@ -144,18 +142,6 @@ public:
}
};
class GSCodeGenerator : public Xbyak::CodeGenerator
{
protected:
Xbyak::util::Cpu m_cpu;
public:
GSCodeGenerator(void* code, size_t maxsize)
: Xbyak::CodeGenerator(maxsize, code)
{
}
};
template <class CG, class KEY, class VALUE>
class GSCodeGeneratorFunctionMap : public GSFunctionMap<KEY, VALUE>
{

4
pcsx2/GS/Renderers/SW/GSDrawScanlineCodeGenerator.all.cpp
View File

@ -81,7 +81,7 @@ using namespace Xbyak;
#define _rip_local_d_p(x) _rip_local_d(x)
#endif
GSDrawScanlineCodeGenerator2::GSDrawScanlineCodeGenerator2(Xbyak::CodeGenerator* base, CPUInfo cpu, void* param, u64 key)
GSDrawScanlineCodeGenerator2::GSDrawScanlineCodeGenerator2(Xbyak::CodeGenerator* base, const ProcessorFeatures& cpu, void* param, u64 key)
: _parent(base, cpu)
, m_local(*(GSScanlineLocalData*)param)
, m_rip(false)
@ -243,7 +243,7 @@ void GSDrawScanlineCodeGenerator2::alltrue(const XYm& test)
u32 mask = test.isYMM() ? 0xffffffff : 0xffff;
pmovmskb(eax, test);
cmp(eax, mask);
je("step", GSCodeGenerator::T_NEAR);
je("step", Xbyak::CodeGenerator::T_NEAR);
}
void GSDrawScanlineCodeGenerator2::blend(const XYm& a, const XYm& b, const XYm& mask)

2
pcsx2/GS/Renderers/SW/GSDrawScanlineCodeGenerator.all.h
View File

@ -94,7 +94,7 @@ class GSDrawScanlineCodeGenerator2 : public GSNewCodeGenerator
}
public:
GSDrawScanlineCodeGenerator2(Xbyak::CodeGenerator* base, CPUInfo cpu, void* param, u64 key);
GSDrawScanlineCodeGenerator2(Xbyak::CodeGenerator* base, const ProcessorFeatures& cpu, void* param, u64 key);
void Generate();
private:

4
pcsx2/GS/Renderers/SW/GSDrawScanlineCodeGenerator.cpp
View File

@ -82,7 +82,7 @@ static bool shouldUseCDrawScanline(u64 key)
}
GSDrawScanlineCodeGenerator::GSDrawScanlineCodeGenerator(void* param, u64 key, void* code, size_t maxsize)
: GSCodeGenerator(code, maxsize)
: Xbyak::CodeGenerator(maxsize, code)
, m_local(*(GSScanlineLocalData*)param)
, m_rip(false)
{
@ -108,5 +108,5 @@ GSDrawScanlineCodeGenerator::GSDrawScanlineCodeGenerator(void* param, u64 key, v
return;
}
GSDrawScanlineCodeGenerator2(this, CPUInfo(m_cpu), (void*)&m_local, m_sel.key).Generate();
GSDrawScanlineCodeGenerator2(this, g_cpu, (void*)&m_local, m_sel.key).Generate();
}

3
pcsx2/GS/Renderers/SW/GSDrawScanlineCodeGenerator.h
View File

@ -19,6 +19,7 @@
#include "GS/Renderers/Common/GSFunctionMap.h"
#include "GS/GSUtil.h"
#include "GS/MultiISA.h"
#include <xbyak/xbyak.h>
#if defined(_M_AMD64) || defined(_WIN64)
#define RegLong Xbyak::Reg64
@ -28,7 +29,7 @@
MULTI_ISA_UNSHARED_START
class GSDrawScanlineCodeGenerator : public GSCodeGenerator
class GSDrawScanlineCodeGenerator : public Xbyak::CodeGenerator
{
void operator=(const GSDrawScanlineCodeGenerator&);

37
pcsx2/GS/Renderers/SW/GSNewCodeGenerator.h
View File

@ -17,36 +17,7 @@
#include "xbyak/xbyak.h"
#include "xbyak/xbyak_util.h"
namespace SSEVersion
{
enum SSEVersion
{
AVX2 = 0x501,
AVX = 0x500,
SSE41 = 0x401,
};
}
/// Similar to Xbyak::util::cpu but more open to us putting in extra flags (e.g. "vpgatherdd is fast"), as well as making it easier to test other configurations by artifically limiting features
struct CPUInfo
{
bool hasFMA = false;
SSEVersion::SSEVersion sseVersion = SSEVersion::SSE41;
CPUInfo() = default;
CPUInfo(const Xbyak::util::Cpu& cpu)
{
auto version = SSEVersion::SSE41;
if (cpu.has(cpu.tAVX))
version = SSEVersion::AVX;
if (cpu.has(cpu.tAVX2))
version = SSEVersion::AVX2;
hasFMA = cpu.has(cpu.tFMA);
sseVersion = version;
}
};
#include "GS/MultiISA.h"
/// Code generator that automatically selects between SSE and AVX, x86 and x64 so you don't have to
/// Should make combined SSE and AVX codegen much easier
@ -130,10 +101,10 @@ public:
const RipType rip{};
const Xbyak::AddressFrame ptr{0}, byte{8}, word{16}, dword{32}, qword{64}, xword{128}, yword{256}, zword{512};
GSNewCodeGenerator(Xbyak::CodeGenerator* actual, CPUInfo cpu)
GSNewCodeGenerator(Xbyak::CodeGenerator* actual, const ProcessorFeatures& cpu)
: actual(*actual)
, hasAVX(cpu.sseVersion >= SSEVersion::AVX)
, hasAVX2(cpu.sseVersion >= SSEVersion::AVX2)
, hasAVX(cpu.vectorISA >= ProcessorFeatures::VectorISA::AVX)
, hasAVX2(cpu.vectorISA >= ProcessorFeatures::VectorISA::AVX2)
, hasFMA(cpu.hasFMA)
{
}

2
pcsx2/GS/Renderers/SW/GSSetupPrimCodeGenerator.all.cpp
View File

@ -48,7 +48,7 @@ using namespace Xbyak;
#define _rip_local_d_p(x) _rip_local_d(x)
#endif
GSSetupPrimCodeGenerator2::GSSetupPrimCodeGenerator2(Xbyak::CodeGenerator* base, CPUInfo cpu, void* param, u64 key)
GSSetupPrimCodeGenerator2::GSSetupPrimCodeGenerator2(Xbyak::CodeGenerator* base, const ProcessorFeatures& cpu, void* param, u64 key)
: _parent(base, cpu)
, m_local(*(GSScanlineLocalData*)param)
, m_rip(false), many_regs(false)

2
pcsx2/GS/Renderers/SW/GSSetupPrimCodeGenerator.all.h
View File

@ -66,7 +66,7 @@ class GSSetupPrimCodeGenerator2 : public GSNewCodeGenerator
}
public:
GSSetupPrimCodeGenerator2(Xbyak::CodeGenerator* base, CPUInfo cpu, void* param, u64 key);
GSSetupPrimCodeGenerator2(Xbyak::CodeGenerator* base, const ProcessorFeatures& cpu, void* param, u64 key);
void Generate();
private:

4
pcsx2/GS/Renderers/SW/GSSetupPrimCodeGenerator.cpp
View File

@ -20,7 +20,7 @@
MULTI_ISA_UNSHARED_IMPL;
GSSetupPrimCodeGenerator::GSSetupPrimCodeGenerator(void* param, u64 key, void* code, size_t maxsize)
: GSCodeGenerator(code, maxsize)
: Xbyak::CodeGenerator(maxsize, code)
, m_local(*(GSScanlineLocalData*)param)
, m_rip(false)
{
@ -31,5 +31,5 @@ GSSetupPrimCodeGenerator::GSSetupPrimCodeGenerator(void* param, u64 key, void* c
m_en.t = m_sel.fb && m_sel.tfx != TFX_NONE ? 1 : 0;
m_en.c = m_sel.fb && !(m_sel.tfx == TFX_DECAL && m_sel.tcc) ? 1 : 0;
GSSetupPrimCodeGenerator2(this, CPUInfo(m_cpu), param, key).Generate();
GSSetupPrimCodeGenerator2(this, g_cpu, param, key).Generate();
}

4
pcsx2/GS/Renderers/SW/GSSetupPrimCodeGenerator.h
View File

@ -16,13 +16,13 @@
#pragma once
#include "GSScanlineEnvironment.h"
#include "GS/Renderers/Common/GSFunctionMap.h"
#include "GS/GSUtil.h"
#include "GS/MultiISA.h"
#include <xbyak/xbyak.h>
MULTI_ISA_UNSHARED_START
class GSSetupPrimCodeGenerator : public GSCodeGenerator
class GSSetupPrimCodeGenerator : public Xbyak::CodeGenerator
{
void operator=(const GSSetupPrimCodeGenerator&);