Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Explicitly rename has_512 into has_avx512 #7751

Merged
merged 2 commits into from Mar 10, 2020
Merged

Explicitly rename has_512 into has_avx512 #7751

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d148619
Explicitly Rename has_512 into has_avx512
sampletext32 Mar 10, 2020
454fb70
Back move functions
sampletext32 Mar 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion Utilities/JIT.cpp
View file
Open in desktop
Expand Up @@ -1077,7 +1077,7 @@ std::string jit_compiler::cpu(const std::string& _cpu)
m_cpu == "tigerlake")
{
// Downgrade if AVX-512 is disabled or not supported
if (!utils::has_512())
if (!utils::has_avx512())
{
m_cpu = "skylake";
}
Expand Down
6 changes: 3 additions & 3 deletions Utilities/sysinfo.cpp
View file
Open in desktop
Expand Up @@ -56,10 +56,10 @@ bool utils::has_mpx()
return g_value;
}

bool utils::has_512()
bool utils::has_avx512()
{
// Check AVX512F, AVX512CD, AVX512DQ, AVX512BW, AVX512VL extensions (Skylake-X level support)
static const bool g_value = get_cpuid(0, 0)[0] >= 0x7 && (get_cpuid(7, 0)[1] & 0xd0030000) == 0xd0030000 && (get_cpuid(1,0)[2] & 0x0C000000) == 0x0C000000 && (get_xgetbv(0) & 0xe6) == 0xe6;
static const bool g_value = get_cpuid(0, 0)[0] >= 0x7 && (get_cpuid(7, 0)[1] & 0xd0030000) == 0xd0030000 && (get_cpuid(1, 0)[2] & 0x0C000000) == 0x0C000000 && (get_xgetbv(0) & 0xe6) == 0xe6;
return g_value;
}

Expand Down Expand Up @@ -131,7 +131,7 @@ std::string utils::get_system_info()
result += '+';
}

if (has_512())
if (has_avx512())
{
result += '+';
}
Expand Down
2 changes: 1 addition & 1 deletion Utilities/sysinfo.h
View file
Open in desktop
Expand Up @@ -41,7 +41,7 @@ namespace utils

bool has_mpx();

bool has_512();
bool has_avx512();

bool has_xop();

Expand Down
38 changes: 19 additions & 19 deletions rpcs3/Emu/Cell/SPUASMJITRecompiler.cpp
View file
Open in desktop
Expand Up @@ -280,7 +280,7 @@ spu_function_t spu_recompiler::compile(spu_program&& _func)
c->vzeroupper();
}
}
else if (utils::has_512() && false)
else if (utils::has_avx512() && false)
{
// AVX-512 optimized check using 512-bit registers (disabled)
words_align = 64;
Expand Down Expand Up @@ -361,7 +361,7 @@ spu_function_t spu_recompiler::compile(spu_program&& _func)
c->jnz(label_diff);
c->vzeroupper();
}
else if (0 && utils::has_512())
else if (0 && utils::has_avx512())
{
// AVX-512 optimized check using 256-bit registers
words_align = 32;
Expand Down Expand Up @@ -1789,7 +1789,7 @@ void spu_recompiler::BG(spu_opcode_t op)
const XmmLink& va = XmmGet(op.ra, XmmType::Int);
const XmmLink& vi = XmmAlloc();

if (utils::has_512())
if (utils::has_avx512())
{
const XmmLink& vb = XmmGet(op.rb, XmmType::Int);
c->vpsubd(vi, vb, va);
Expand Down Expand Up @@ -1819,7 +1819,7 @@ void spu_recompiler::NOR(spu_opcode_t op)
{
const XmmLink& va = XmmGet(op.ra, XmmType::Int);

if (utils::has_512())
if (utils::has_avx512())
{
c->vpternlogd(va, va, SPU_OFF_128(gpr, op.rb), 0x11 /* norCB */);
c->movdqa(SPU_OFF_128(gpr, op.rt), va);
Expand All @@ -1845,7 +1845,7 @@ void spu_recompiler::ABSDB(spu_opcode_t op)

void spu_recompiler::ROT(spu_opcode_t op)
{
if (utils::has_512())
if (utils::has_avx512())
{
const XmmLink& va = XmmGet(op.ra, XmmType::Int);
const XmmLink& vb = XmmGet(op.rb, XmmType::Int);
Expand Down Expand Up @@ -2007,7 +2007,7 @@ void spu_recompiler::SHL(spu_opcode_t op)

void spu_recompiler::ROTH(spu_opcode_t op) //nf
{
if (utils::has_512())
if (utils::has_avx512())
{
const XmmLink& va = XmmGet(op.ra, XmmType::Int);
const XmmLink& vb = XmmGet(op.rb, XmmType::Int);
Expand Down Expand Up @@ -2046,7 +2046,7 @@ void spu_recompiler::ROTH(spu_opcode_t op) //nf

void spu_recompiler::ROTHM(spu_opcode_t op)
{
if (utils::has_512())
if (utils::has_avx512())
{
const XmmLink& va = XmmGet(op.ra, XmmType::Int);
const XmmLink& vb = XmmGet(op.rb, XmmType::Int);
Expand Down Expand Up @@ -2106,7 +2106,7 @@ void spu_recompiler::ROTHM(spu_opcode_t op)

void spu_recompiler::ROTMAH(spu_opcode_t op)
{
if (utils::has_512())
if (utils::has_avx512())
{
const XmmLink& va = XmmGet(op.ra, XmmType::Int);
const XmmLink& vb = XmmGet(op.rb, XmmType::Int);
Expand Down Expand Up @@ -2167,7 +2167,7 @@ void spu_recompiler::ROTMAH(spu_opcode_t op)

void spu_recompiler::SHLH(spu_opcode_t op)
{
if (utils::has_512())
if (utils::has_avx512())
{
const XmmLink& va = XmmGet(op.ra, XmmType::Int);
const XmmLink& vb = XmmGet(op.rb, XmmType::Int);
Expand Down Expand Up @@ -2224,7 +2224,7 @@ void spu_recompiler::ROTI(spu_opcode_t op)
// rotate left
const int s = op.i7 & 0x1f;

if (utils::has_512())
if (utils::has_avx512())
{
const XmmLink& va = XmmGet(op.ra, XmmType::Int);
c->vprold(va, va, s);
Expand Down Expand Up @@ -2337,7 +2337,7 @@ void spu_recompiler::CG(spu_opcode_t op)
const XmmLink& vb = XmmGet(op.rb, XmmType::Int);
const XmmLink& vi = XmmAlloc();

if (utils::has_512())
if (utils::has_avx512())
{
c->vpaddd(vi, vb, va);
c->vpternlogd(vi, va, vb, 0x8e /* A?andBC:orBC */);
Expand Down Expand Up @@ -2367,7 +2367,7 @@ void spu_recompiler::NAND(spu_opcode_t op)
// nand
const XmmLink& va = XmmGet(op.ra, XmmType::Int);

if (utils::has_512())
if (utils::has_avx512())
{
c->vpternlogd(va, va, SPU_OFF_128(gpr, op.rb), 0x77 /* nandCB */);
c->movdqa(SPU_OFF_128(gpr, op.rt), va);
Expand Down Expand Up @@ -3339,7 +3339,7 @@ void spu_recompiler::EQV(spu_opcode_t op)
{
const XmmLink& vb = XmmGet(op.rb, XmmType::Int);

if (utils::has_512())
if (utils::has_avx512())
{
c->vpternlogd(vb, vb, SPU_OFF_128(gpr, op.ra), 0x99 /* xnorCB */);
c->movdqa(SPU_OFF_128(gpr, op.rt), vb);
Expand Down Expand Up @@ -3407,7 +3407,7 @@ void spu_recompiler::HGT(spu_opcode_t op)

void spu_recompiler::CLZ(spu_opcode_t op)
{
if (utils::has_512())
if (utils::has_avx512())
{
const XmmLink& va = XmmGet(op.ra, XmmType::Int);
const XmmLink& vt = XmmAlloc();
Expand Down Expand Up @@ -3633,7 +3633,7 @@ void spu_recompiler::ORC(spu_opcode_t op)
{
const XmmLink& vb = XmmGet(op.rb, XmmType::Int);

if (utils::has_512())
if (utils::has_avx512())
{
c->vpternlogd(vb, vb, SPU_OFF_128(gpr, op.ra), 0xbb /* orC!B */);
c->movdqa(SPU_OFF_128(gpr, op.rt), vb);
Expand Down Expand Up @@ -4095,7 +4095,7 @@ void spu_recompiler::CFLTU(spu_opcode_t op)
const XmmLink& vs3 = XmmAlloc();
if (op.i8 != 173) c->mulps(va, XmmConst(_mm_set1_ps(std::exp2(static_cast<float>(static_cast<s16>(173 - op.i8)))))); // scale

if (utils::has_512())
if (utils::has_avx512())
{
c->vcvttps2udq(vs, va);
c->psrad(va, 31);
Expand Down Expand Up @@ -4134,7 +4134,7 @@ void spu_recompiler::CUFLT(spu_opcode_t op)
const XmmLink& va = XmmGet(op.ra, XmmType::Int);
const XmmLink& v1 = XmmAlloc();

if (utils::has_512())
if (utils::has_avx512())
{
c->vcvtudq2ps(va, va);
}
Expand Down Expand Up @@ -4722,7 +4722,7 @@ void spu_recompiler::SELB(spu_opcode_t op)
const XmmLink& vb = XmmGet(op.rb, XmmType::Int);
const XmmLink& vc = XmmGet(op.rc, XmmType::Int);

if (utils::has_512())
if (utils::has_avx512())
{
c->vpternlogd(vc, vb, SPU_OFF_128(gpr, op.ra), 0xca /* A?B:C */);
c->movdqa(SPU_OFF_128(gpr, op.rt4), vc);
Expand All @@ -4744,7 +4744,7 @@ void spu_recompiler::SELB(spu_opcode_t op)

void spu_recompiler::SHUFB(spu_opcode_t op)
{
if (0 && utils::has_512())
if (0 && utils::has_avx512())
{
// Deactivated due to poor performance of mask merge ops.
const XmmLink& va = XmmGet(op.ra, XmmType::Int);
Expand Down