Merge branch 'master' of https://github.com/xenia-project/xenia into canary_experimental
This commit is contained in:
@@ -37,6 +37,7 @@
|
||||
#include "xenia/cpu/backend/x64/x64_tracers.h"
|
||||
// needed for stmxcsr
|
||||
#include "xenia/cpu/backend/x64/x64_stack_layout.h"
|
||||
#include "xenia/cpu/backend/x64/x64_util.h"
|
||||
#include "xenia/cpu/hir/hir_builder.h"
|
||||
#include "xenia/cpu/processor.h"
|
||||
|
||||
@@ -700,6 +701,26 @@ struct SELECT_F64
|
||||
static void Emit(X64Emitter& e, const EmitArgType& i) {
|
||||
e.ChangeMxcsrMode(MXCSRMode::Fpu);
|
||||
// dest = src1 != 0 ? src2 : src3
|
||||
|
||||
if (e.IsFeatureEnabled(kX64EmitAVX512Ortho)) {
|
||||
e.movzx(e.rax, i.src1);
|
||||
e.vmovq(e.xmm0, e.rax);
|
||||
e.vptestmq(e.k1, e.xmm0, e.xmm0);
|
||||
|
||||
const Xmm src2 = i.src2.is_constant ? e.xmm1 : i.src2;
|
||||
if (i.src2.is_constant) {
|
||||
e.LoadConstantXmm(src2, i.src2.constant());
|
||||
}
|
||||
|
||||
const Xmm src3 = i.src3.is_constant ? e.xmm2 : i.src3;
|
||||
if (i.src3.is_constant) {
|
||||
e.LoadConstantXmm(src3, i.src3.constant());
|
||||
}
|
||||
|
||||
e.vpblendmq(i.dest.reg() | e.k1, src3, src2);
|
||||
return;
|
||||
}
|
||||
|
||||
e.movzx(e.eax, i.src1);
|
||||
e.vmovd(e.xmm1, e.eax);
|
||||
e.vpxor(e.xmm0, e.xmm0);
|
||||
@@ -762,7 +783,7 @@ struct SELECT_V128_V128
|
||||
: Sequence<SELECT_V128_V128,
|
||||
I<OPCODE_SELECT, V128Op, V128Op, V128Op, V128Op>> {
|
||||
static void Emit(X64Emitter& e, const EmitArgType& i) {
|
||||
Xmm src1 = i.src1.is_constant ? e.xmm0 : i.src1;
|
||||
const Xmm src1 = i.src1.is_constant ? e.xmm0 : i.src1;
|
||||
PermittedBlend mayblend = GetPermittedBlendForSelectV128(i.src1.value);
|
||||
// todo: detect whether src1 is only 0 or FFFF and use blends if so.
|
||||
// currently we only detect cmps
|
||||
@@ -770,16 +791,25 @@ struct SELECT_V128_V128
|
||||
e.LoadConstantXmm(src1, i.src1.constant());
|
||||
}
|
||||
|
||||
Xmm src2 = i.src2.is_constant ? e.xmm1 : i.src2;
|
||||
const Xmm src2 = i.src2.is_constant ? e.xmm1 : i.src2;
|
||||
if (i.src2.is_constant) {
|
||||
e.LoadConstantXmm(src2, i.src2.constant());
|
||||
}
|
||||
|
||||
Xmm src3 = i.src3.is_constant ? e.xmm2 : i.src3;
|
||||
const Xmm src3 = i.src3.is_constant ? e.xmm2 : i.src3;
|
||||
if (i.src3.is_constant) {
|
||||
e.LoadConstantXmm(src3, i.src3.constant());
|
||||
}
|
||||
|
||||
if (e.IsFeatureEnabled(kX64EmitAVX512Ortho)) {
|
||||
e.vmovdqa(e.xmm3, src1);
|
||||
e.vpternlogd(e.xmm3, src2, src3,
|
||||
(~TernaryOperand::a & TernaryOperand::b) |
|
||||
(TernaryOperand::c & TernaryOperand::a));
|
||||
e.vmovdqa(i.dest, e.xmm3);
|
||||
return;
|
||||
}
|
||||
|
||||
if (mayblend == PermittedBlend::Int8) {
|
||||
e.vpblendvb(i.dest, src2, src3, src1);
|
||||
} else if (mayblend == PermittedBlend::Ps) {
|
||||
|
||||
Reference in New Issue
Block a user