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

Possibly correct FLOAT16 unpack.

This commit is contained in:
Ben Vanik 2014-06-10 21:35:50 -07:00
parent 574a04a853
commit 713cfcb429
3 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/alloy/backend/x64/x64_emitter.cc
View File

@ -505,6 +505,7 @@ Address X64Emitter::GetXmmConstPtr(XmmConst id) {
/* XMMFlipX16Y16 */ vec128i(0x00008000u, 0x00000000u, 0x00000000u, 0x00000000u), /* XMMFlipX16Y16 */ vec128i(0x00008000u, 0x00000000u, 0x00000000u, 0x00000000u),
/* XMMFixX16Y16 */ vec128f(-32768.0f, 0.0f, 0.0f, 0.0f), /* XMMFixX16Y16 */ vec128f(-32768.0f, 0.0f, 0.0f, 0.0f),
/* XMMNormalizeX16Y16 */ vec128f(1.0f / 32767.0f, 1.0f / (32767.0f * 65536.0f), 0.0f, 0.0f), /* XMMNormalizeX16Y16 */ vec128f(1.0f / 32767.0f, 1.0f / (32767.0f * 65536.0f), 0.0f, 0.0f),
/* XMM0001 */ vec128f(0.0f, 0.0f, 0.0f, 1.0f),
/* XMM3301 */ vec128f(3.0f, 3.0f, 0.0f, 1.0f), /* XMM3301 */ vec128f(3.0f, 3.0f, 0.0f, 1.0f),
/* XMMSignMaskPS */ vec128i(0x80000000u, 0x80000000u, 0x80000000u, 0x80000000u), /* XMMSignMaskPS */ vec128i(0x80000000u, 0x80000000u, 0x80000000u, 0x80000000u),
/* XMMSignMaskPD */ vec128i(0x00000000u, 0x80000000u, 0x00000000u, 0x80000000u), /* XMMSignMaskPD */ vec128i(0x00000000u, 0x80000000u, 0x00000000u, 0x80000000u),

1
src/alloy/backend/x64/x64_emitter.h
View File

@ -43,6 +43,7 @@ enum XmmConst {
XMMFlipX16Y16, XMMFlipX16Y16,
XMMFixX16Y16, XMMFixX16Y16,
XMMNormalizeX16Y16, XMMNormalizeX16Y16,
XMM0001,
XMM3301, XMM3301,
XMMSignMaskPS, XMMSignMaskPS,
XMMSignMaskPD, XMMSignMaskPD,

21
src/alloy/backend/x64/x64_sequences.cc
View File

@ -29,9 +29,6 @@
#include <alloy/hir/hir_builder.h> #include <alloy/hir/hir_builder.h>
#include <alloy/runtime/runtime.h> #include <alloy/runtime/runtime.h>
// TODO(benvanik): reimplement packing functions
#include <DirectXPackedVector.h>
using namespace alloy; using namespace alloy;
using namespace alloy::backend; using namespace alloy::backend;
using namespace alloy::backend::x64; using namespace alloy::backend::x64;
@ -4820,13 +4817,6 @@ EMITTER(UNPACK, MATCH(I<OPCODE_UNPACK, V128<>, V128<>>)) {
// mult by 1/255 // mult by 1/255
e.vmulps(i.dest, e.GetXmmConstPtr(XMMOneOver255)); e.vmulps(i.dest, e.GetXmmConstPtr(XMMOneOver255));
} }
static void Unpack_FLOAT16_2(void* raw_context, __m128& v) {
uint32_t src = v.m128_i32[3];
v.m128_f32[0] = DirectX::PackedVector::XMConvertHalfToFloat((uint16_t)src);
v.m128_f32[1] = DirectX::PackedVector::XMConvertHalfToFloat((uint16_t)(src >> 16));
v.m128_f32[2] = 0.0f;
v.m128_f32[3] = 1.0f;
}
static void EmitFLOAT16_2(X64Emitter& e, const EmitArgType& i) { static void EmitFLOAT16_2(X64Emitter& e, const EmitArgType& i) {
// 1 bit sign, 5 bit exponent, 10 bit mantissa // 1 bit sign, 5 bit exponent, 10 bit mantissa
// D3D10 half float format // D3D10 half float format
@ -4844,14 +4834,13 @@ EMITTER(UNPACK, MATCH(I<OPCODE_UNPACK, V128<>, V128<>>)) {
// XMConvertHalfToFloat(sy), // XMConvertHalfToFloat(sy),
// 0.0, // 0.0,
// 1.0 }; // 1.0 };
auto addr = e.StashXmm(i.src1); e.vcvtph2ps(i.dest, i.src1);
e.lea(e.rdx, addr); e.vpshufd(i.dest, i.dest, B10100100);
e.CallNative(Unpack_FLOAT16_2); e.vpor(i.dest, e.GetXmmConstPtr(XMM0001));
e.vmovaps(i.dest, addr);
} }
static void EmitFLOAT16_4(X64Emitter& e, const EmitArgType& i) { static void EmitFLOAT16_4(X64Emitter& e, const EmitArgType& i) {
// Could be shared with FLOAT16_2. // src = [(dest.x | dest.y), (dest.z | dest.w), 0, 0]
XEASSERTALWAYS(); e.vcvtph2ps(i.dest, i.src1);
} }
static void EmitSHORT_2(X64Emitter& e, const EmitArgType& i) { static void EmitSHORT_2(X64Emitter& e, const EmitArgType& i) {
// (VD.x) = 3.0 + (VB.x>>16)*2^-22 // (VD.x) = 3.0 + (VB.x>>16)*2^-22