Implement floating-point rounding intrinsics.
Bug swiftshader:15
Change-Id: I27fe7bd2f0deaf19fab2f4565574ad084c49cddb
Reviewed-on: https://swiftshader-review.googlesource.com/7954
Reviewed-by: Nicolas Capens <capn@google.com>
Tested-by: Nicolas Capens <capn@google.com>
Reviewed-on: https://swiftshader-review.googlesource.com/8159
Reviewed-by: Alexis Hétu <sugoi@google.com>
diff --git a/src/Reactor/SubzeroReactor.cpp b/src/Reactor/SubzeroReactor.cpp
index 13c01c6..e5386f3 100644
--- a/src/Reactor/SubzeroReactor.cpp
+++ b/src/Reactor/SubzeroReactor.cpp
@@ -384,6 +384,7 @@
Flags.setOutFileType(Ice::FT_Elf);
Flags.setOptLevel(Ice::Opt_2);
Flags.setApplicationBinaryInterface(Ice::ABI_Platform);
+ Flags.setTargetInstructionSet(Ice::X86InstructionSet_SSE4_1);
Flags.setVerbose(false ? Ice::IceV_All : Ice::IceV_None);
static llvm::raw_os_ostream cout(std::cout);
@@ -4010,7 +4011,11 @@
RValue<Int> RoundInt(RValue<Float> cast)
{
- assert(false && "UNIMPLEMENTED"); return RValue<Int>(V(nullptr));
+ Ice::Variable *result = ::function->makeVariable(Ice::IceType_i32);
+ auto round = Ice::InstCast::create(::function, Ice::InstCast::Fptosi, result, cast.value);
+ ::basicBlock->appendInst(round);
+
+ return RValue<Int>(V(result));
}
Type *Int::getType()
@@ -5215,7 +5220,11 @@
RValue<Int4> RoundInt(RValue<Float4> cast)
{
- assert(false && "UNIMPLEMENTED"); return RValue<Int4>(V(nullptr));
+ Ice::Variable *result = ::function->makeVariable(Ice::IceType_v4i32);
+ auto round = Ice::InstCast::create(::function, Ice::InstCast::Fptosi, result, cast.value);
+ ::basicBlock->appendInst(round);
+
+ return RValue<Int4>(V(result));
}
RValue<Short8> Pack(RValue<Int4> x, RValue<Int4> y)
@@ -5751,27 +5760,27 @@
RValue<Float> Round(RValue<Float> x)
{
- assert(false && "UNIMPLEMENTED"); return RValue<Float>(V(nullptr));
+ return Float4(Round(Float4(x))).x;
}
RValue<Float> Trunc(RValue<Float> x)
{
- assert(false && "UNIMPLEMENTED"); return RValue<Float>(V(nullptr));
+ return Float4(Trunc(Float4(x))).x;
}
RValue<Float> Frac(RValue<Float> x)
{
- assert(false && "UNIMPLEMENTED"); return RValue<Float>(V(nullptr));
+ return Float4(Frac(Float4(x))).x;
}
RValue<Float> Floor(RValue<Float> x)
{
- assert(false && "UNIMPLEMENTED"); return RValue<Float>(V(nullptr));
+ return Float4(Floor(Float4(x))).x;
}
RValue<Float> Ceil(RValue<Float> x)
{
- assert(false && "UNIMPLEMENTED"); return RValue<Float>(V(nullptr));
+ return Float4(Ceil(Float4(x))).x;
}
Type *Float::getType()
@@ -6168,27 +6177,59 @@
RValue<Float4> Round(RValue<Float4> x)
{
- assert(false && "UNIMPLEMENTED"); return RValue<Float4>(V(nullptr));
+ Ice::Variable *result = ::function->makeVariable(Ice::IceType_v4f32);
+ const Ice::Intrinsics::IntrinsicInfo intrinsic = {Ice::Intrinsics::Round, Ice::Intrinsics::SideEffects_F, Ice::Intrinsics::ReturnsTwice_F, Ice::Intrinsics::MemoryWrite_F};
+ auto target = ::context->getConstantUndef(Ice::IceType_i32);
+ auto round = Ice::InstIntrinsicCall::create(::function, 2, result, target, intrinsic);
+ round->addArg(x.value);
+ round->addArg(::context->getConstantInt32(0));
+ ::basicBlock->appendInst(round);
+
+ return RValue<Float4>(V(result));
}
RValue<Float4> Trunc(RValue<Float4> x)
{
- assert(false && "UNIMPLEMENTED"); return RValue<Float4>(V(nullptr));
+ Ice::Variable *result = ::function->makeVariable(Ice::IceType_v4f32);
+ const Ice::Intrinsics::IntrinsicInfo intrinsic = {Ice::Intrinsics::Round, Ice::Intrinsics::SideEffects_F, Ice::Intrinsics::ReturnsTwice_F, Ice::Intrinsics::MemoryWrite_F};
+ auto target = ::context->getConstantUndef(Ice::IceType_i32);
+ auto round = Ice::InstIntrinsicCall::create(::function, 2, result, target, intrinsic);
+ round->addArg(x.value);
+ round->addArg(::context->getConstantInt32(3));
+ ::basicBlock->appendInst(round);
+
+ return RValue<Float4>(V(result));
}
RValue<Float4> Frac(RValue<Float4> x)
{
- assert(false && "UNIMPLEMENTED"); return RValue<Float4>(V(nullptr));
+ return x - Floor(x);
}
RValue<Float4> Floor(RValue<Float4> x)
{
- assert(false && "UNIMPLEMENTED"); return RValue<Float4>(V(nullptr));
+ Ice::Variable *result = ::function->makeVariable(Ice::IceType_v4f32);
+ const Ice::Intrinsics::IntrinsicInfo intrinsic = {Ice::Intrinsics::Round, Ice::Intrinsics::SideEffects_F, Ice::Intrinsics::ReturnsTwice_F, Ice::Intrinsics::MemoryWrite_F};
+ auto target = ::context->getConstantUndef(Ice::IceType_i32);
+ auto round = Ice::InstIntrinsicCall::create(::function, 2, result, target, intrinsic);
+ round->addArg(x.value);
+ round->addArg(::context->getConstantInt32(1));
+ ::basicBlock->appendInst(round);
+
+ return RValue<Float4>(V(result));
}
RValue<Float4> Ceil(RValue<Float4> x)
{
- assert(false && "UNIMPLEMENTED"); return RValue<Float4>(V(nullptr));
+ Ice::Variable *result = ::function->makeVariable(Ice::IceType_v4f32);
+ const Ice::Intrinsics::IntrinsicInfo intrinsic = {Ice::Intrinsics::Round, Ice::Intrinsics::SideEffects_F, Ice::Intrinsics::ReturnsTwice_F, Ice::Intrinsics::MemoryWrite_F};
+ auto target = ::context->getConstantUndef(Ice::IceType_i32);
+ auto round = Ice::InstIntrinsicCall::create(::function, 2, result, target, intrinsic);
+ round->addArg(x.value);
+ round->addArg(::context->getConstantInt32(2));
+ ::basicBlock->appendInst(round);
+
+ return RValue<Float4>(V(result));
}
Type *Float4::getType()
diff --git a/third_party/pnacl-subzero b/third_party/pnacl-subzero
index 956cfd6..21f78bb 160000
--- a/third_party/pnacl-subzero
+++ b/third_party/pnacl-subzero
@@ -1 +1 @@
-Subproject commit 956cfd60e8ee9efcc374cd19513bbf35a20e52ee
+Subproject commit 21f78bb1b7cd9040ce5baea3be51f7be49a1bb1f
