wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Back out a615811b12e4 (bug 888109) for not actually building

Browse Source
This commit is contained in:
Phil Ringnalda 2013-09-06 18:48:56 -07:00
parent 9a45656528
commit 73c0fd405e
49 changed files with 78 additions and 1746 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
js/public/Value.h
View File

@ -1273,14 +1273,6 @@ DoubleValue(double dbl)
return v;
}
static inline Value
Float32Value(float f)
{
Value v;
v.setDouble(f);
return v;
}
static inline Value
StringValue(JSString *str)
{

157
js/src/assembler/assembler/X86Assembler.h
View File

@ -2180,14 +2180,6 @@ public:
m_formatter.twoByteOp(OP2_ADDSD_VsdWsd, (RegisterID)dst, (RegisterID)src);
}
void addss_rr(XMMRegisterID src, XMMRegisterID dst)
{
spew("addss %s, %s",
nameFPReg(src), nameFPReg(dst));
m_formatter.prefix(PRE_SSE_F3);
m_formatter.twoByteOp(OP2_ADDSD_VsdWsd, (RegisterID)dst, (RegisterID)src);
}
void addsd_mr(int offset, RegisterID base, XMMRegisterID dst)
{
spew("addsd %s0x%x(%s), %s",
@ -2196,14 +2188,6 @@ public:
m_formatter.twoByteOp(OP2_ADDSD_VsdWsd, (RegisterID)dst, base, offset);
}
void addss_mr(int offset, RegisterID base, XMMRegisterID dst)
{
spew("addss %s0x%x(%s), %s",
PRETTY_PRINT_OFFSET(offset), nameIReg(base), nameFPReg(dst));
m_formatter.prefix(PRE_SSE_F3);
m_formatter.twoByteOp(OP2_ADDSD_VsdWsd, (RegisterID)dst, base, offset);
}
#if !WTF_CPU_X86_64
void addsd_mr(const void* address, XMMRegisterID dst)
{
@ -2212,13 +2196,6 @@ public:
m_formatter.prefix(PRE_SSE_F2);
m_formatter.twoByteOp(OP2_ADDSD_VsdWsd, (RegisterID)dst, address);
}
void addss_mr(const void* address, XMMRegisterID dst)
{
spew("addss %p, %s",
address, nameFPReg(dst));
m_formatter.prefix(PRE_SSE_F3);
m_formatter.twoByteOp(OP2_ADDSD_VsdWsd, (RegisterID)dst, address);
}
#endif
void cvtss2sd_rr(XMMRegisterID src, XMMRegisterID dst)
@ -2237,14 +2214,6 @@ public:
m_formatter.twoByteOp(OP2_CVTSD2SS_VsdEd, (RegisterID)dst, (RegisterID)src);
}
void cvtsi2ss_rr(RegisterID src, XMMRegisterID dst)
{
spew("cvtsi2ss %s, %s",
nameIReg(src), nameFPReg(dst));
m_formatter.prefix(PRE_SSE_F3);
m_formatter.twoByteOp(OP2_CVTSI2SD_VsdEd, (RegisterID)dst, src);
}
void cvtsi2sd_rr(RegisterID src, XMMRegisterID dst)
{
spew("cvtsi2sd %s, %s",
@ -2279,22 +2248,6 @@ public:
m_formatter.twoByteOp(OP2_CVTSI2SD_VsdEd, (RegisterID)dst, base, index, scale, offset);
}
void cvtsi2ss_mr(int offset, RegisterID base, XMMRegisterID dst)
{
spew("cvtsi2ss %s0x%x(%s), %s",
PRETTY_PRINT_OFFSET(offset), nameIReg(base), nameFPReg(dst));
m_formatter.prefix(PRE_SSE_F3);
m_formatter.twoByteOp(OP2_CVTSI2SD_VsdEd, (RegisterID)dst, base, offset);
}
void cvtsi2ss_mr(int offset, RegisterID base, RegisterID index, int scale, XMMRegisterID dst)
{
spew("cvtsi2ss %d(%s,%s,%d), %s",
offset, nameIReg(base), nameIReg(index), 1<<scale, nameFPReg(dst));
m_formatter.prefix(PRE_SSE_F3);
m_formatter.twoByteOp(OP2_CVTSI2SD_VsdEd, (RegisterID)dst, base, index, scale, offset);
}
#if !WTF_CPU_X86_64
void cvtsi2sd_mr(const void* address, XMMRegisterID dst)
{
@ -2313,14 +2266,6 @@ public:
m_formatter.twoByteOp(OP2_CVTTSD2SI_GdWsd, dst, (RegisterID)src);
}
void cvttss2si_rr(XMMRegisterID src, RegisterID dst)
{
spew("cvttss2si %s, %s",
nameFPReg(src), nameIReg(4, dst));
m_formatter.prefix(PRE_SSE_F3);
m_formatter.twoByteOp(OP2_CVTTSD2SI_GdWsd, dst, (RegisterID)src);
}
#if WTF_CPU_X86_64
void cvttsd2sq_rr(XMMRegisterID src, RegisterID dst)
{
@ -2538,14 +2483,6 @@ public:
m_formatter.twoByteOp(OP2_MOVSD_VsdWsd, (RegisterID)dst, (RegisterID)src);
}
void movss_rr(XMMRegisterID src, XMMRegisterID dst)
{
spew("movss %s, %s",
nameFPReg(src), nameFPReg(dst));
m_formatter.prefix(PRE_SSE_F3);
m_formatter.twoByteOp(OP2_MOVSD_VsdWsd, (RegisterID)dst, (RegisterID)src);
}
#if !WTF_CPU_X86_64
void movsd_mr(const void* address, XMMRegisterID dst)
{
@ -2555,14 +2492,6 @@ public:
m_formatter.twoByteOp(OP2_MOVSD_VsdWsd, (RegisterID)dst, address);
}
void movss_mr(const void* address, XMMRegisterID dst)
{
spew("movss %p, %s",
address, nameFPReg(dst));
m_formatter.prefix(PRE_SSE_F3);
m_formatter.twoByteOp(OP2_MOVSD_VsdWsd, (RegisterID)dst, address);
}
void movsd_rm(XMMRegisterID src, const void* address)
{
spew("movsd %s, %p",
@ -2570,14 +2499,6 @@ public:
m_formatter.prefix(PRE_SSE_F2);
m_formatter.twoByteOp(OP2_MOVSD_WsdVsd, (RegisterID)src, address);
}
void movss_rm(XMMRegisterID src, const void* address)
{
spew("movss %s, %p",
nameFPReg(src), address);
m_formatter.prefix(PRE_SSE_F3);
m_formatter.twoByteOp(OP2_MOVSD_WsdVsd, (RegisterID)src, address);
}
#else
JmpSrc movsd_ripr(XMMRegisterID dst)
{
@ -2637,14 +2558,6 @@ public:
m_formatter.twoByteOp(OP2_MULSD_VsdWsd, (RegisterID)dst, (RegisterID)src);
}
void mulss_rr(XMMRegisterID src, XMMRegisterID dst)
{
spew("mulss %s, %s",
nameFPReg(src), nameFPReg(dst));
m_formatter.prefix(PRE_SSE_F3);
m_formatter.twoByteOp(OP2_MULSD_VsdWsd, (RegisterID)dst, (RegisterID)src);
}
void mulsd_mr(int offset, RegisterID base, XMMRegisterID dst)
{
spew("mulsd %s0x%x(%s), %s",
@ -2653,14 +2566,6 @@ public:
m_formatter.twoByteOp(OP2_MULSD_VsdWsd, (RegisterID)dst, base, offset);
}
void mulss_mr(int offset, RegisterID base, XMMRegisterID dst)
{
spew("mulss %s0x%x(%s), %s",
PRETTY_PRINT_OFFSET(offset), nameIReg(base), nameFPReg(dst));
m_formatter.prefix(PRE_SSE_F3);
m_formatter.twoByteOp(OP2_MULSD_VsdWsd, (RegisterID)dst, base, offset);
}
void pextrw_irr(int whichWord, XMMRegisterID src, RegisterID dst)
{
FIXME_INSN_PRINTING;
@ -2677,14 +2582,6 @@ public:
m_formatter.twoByteOp(OP2_SUBSD_VsdWsd, (RegisterID)dst, (RegisterID)src);
}
void subss_rr(XMMRegisterID src, XMMRegisterID dst)
{
spew("subss %s, %s",
nameFPReg(src), nameFPReg(dst));
m_formatter.prefix(PRE_SSE_F3);
m_formatter.twoByteOp(OP2_SUBSD_VsdWsd, (RegisterID)dst, (RegisterID)src);
}
void subsd_mr(int offset, RegisterID base, XMMRegisterID dst)
{
spew("subsd %s0x%x(%s), %s",
@ -2693,21 +2590,6 @@ public:
m_formatter.twoByteOp(OP2_SUBSD_VsdWsd, (RegisterID)dst, base, offset);
}
void subss_mr(int offset, RegisterID base, XMMRegisterID dst)
{
spew("subss %s0x%x(%s), %s",
PRETTY_PRINT_OFFSET(offset), nameIReg(base), nameFPReg(dst));
m_formatter.prefix(PRE_SSE_F3);
m_formatter.twoByteOp(OP2_SUBSD_VsdWsd, (RegisterID)dst, base, offset);
}
void ucomiss_rr(XMMRegisterID src, XMMRegisterID dst)
{
spew("ucomiss %s, %s",
nameFPReg(src), nameFPReg(dst));
m_formatter.twoByteOp(OP2_UCOMISD_VsdWsd, (RegisterID)dst, (RegisterID)src);
}
void ucomisd_rr(XMMRegisterID src, XMMRegisterID dst)
{
spew("ucomisd %s, %s",
@ -2732,14 +2614,6 @@ public:
m_formatter.twoByteOp(OP2_DIVSD_VsdWsd, (RegisterID)dst, (RegisterID)src);
}
void divss_rr(XMMRegisterID src, XMMRegisterID dst)
{
spew("divss %s, %s",
nameFPReg(src), nameFPReg(dst));
m_formatter.prefix(PRE_SSE_F3);
m_formatter.twoByteOp(OP2_DIVSD_VsdWsd, (RegisterID)dst, (RegisterID)src);
}
void divsd_mr(int offset, RegisterID base, XMMRegisterID dst)
{
spew("divsd %s0x%x(%s), %s",
@ -2748,14 +2622,6 @@ public:
m_formatter.twoByteOp(OP2_DIVSD_VsdWsd, (RegisterID)dst, base, offset);
}
void divss_mr(int offset, RegisterID base, XMMRegisterID dst)
{
spew("divss %s0x%x(%s), %s",
PRETTY_PRINT_OFFSET(offset), nameIReg(base), nameFPReg(dst));
m_formatter.prefix(PRE_SSE_F3);
m_formatter.twoByteOp(OP2_DIVSD_VsdWsd, (RegisterID)dst, base, offset);
}
void xorpd_rr(XMMRegisterID src, XMMRegisterID dst)
{
spew("xorpd %s, %s",
@ -2764,13 +2630,6 @@ public:
m_formatter.twoByteOp(OP2_XORPD_VpdWpd, (RegisterID)dst, (RegisterID)src);
}
void xorps_rr(XMMRegisterID src, XMMRegisterID dst)
{
spew("xorps %s, %s",
nameFPReg(src), nameFPReg(dst));
m_formatter.twoByteOp(OP2_XORPD_VpdWpd, (RegisterID)dst, (RegisterID)src);
}
void orpd_rr(XMMRegisterID src, XMMRegisterID dst)
{
spew("orpd %s, %s",
@ -2935,11 +2794,6 @@ public:
spew(".double %.20f", d);
m_formatter.doubleConstant(d);
}
void floatConstant(float f)
{
spew(".float %.20f", f);
m_formatter.floatConstant(f);
}
void int64Constant(int64_t i)
{
@ -3580,17 +3434,6 @@ private:
m_buffer.putInt64Unchecked(u.u64);
}
void floatConstant(float f)
{
m_buffer.ensureSpace(sizeof(float));
union {
uint32_t u32;
float f;
} u;
u.f = f;
m_buffer.putIntUnchecked(u.u32);
}
void int64Constant(int64_t i)
{
m_buffer.ensureSpace(sizeof(int64_t));

10
js/src/jit/BaselineIC.cpp
View File

@ -15,7 +15,6 @@
#include "jit/BaselineJIT.h"
#include "jit/IonLinker.h"
#include "jit/IonSpewer.h"
#include "jit/Lowering.h"
#include "jit/PerfSpewer.h"
#include "jit/VMFunctions.h"
@ -5168,14 +5167,7 @@ ICSetElem_TypedArray::Compiler::generateStubCode(MacroAssembler &masm)
if (type_ == ScalarTypeRepresentation::TYPE_FLOAT32 || type_ == ScalarTypeRepresentation::TYPE_FLOAT64) {
masm.ensureDouble(value, FloatReg0, &failure);
if (LIRGenerator::allowFloat32Optimizations() &&
type_ == ScalarTypeRepresentation::TYPE_FLOAT32)
{
masm.convertDoubleToFloat(FloatReg0, ScratchFloatReg);
masm.storeToTypedFloatArray(type_, ScratchFloatReg, dest);
} else {
masm.storeToTypedFloatArray(type_, FloatReg0, dest);
}
masm.storeToTypedFloatArray(type_, FloatReg0, dest);
EmitReturnFromIC(masm);
} else if (type_ == ScalarTypeRepresentation::TYPE_UINT8_CLAMPED) {
Label notInt32;

95
js/src/jit/CodeGenerator.cpp
View File

@ -302,67 +302,6 @@ CodeGenerator::visitValueToDouble(LValueToDouble *lir)
return true;
}
bool
CodeGenerator::visitValueToFloat32(LValueToFloat32 *lir)
{
MToFloat32 *mir = lir->mir();
ValueOperand operand = ToValue(lir, LValueToFloat32::Input);
FloatRegister output = ToFloatRegister(lir->output());
Register tag = masm.splitTagForTest(operand);
Label isDouble, isInt32, isBool, isNull, isUndefined, done;
bool hasBoolean = false, hasNull = false, hasUndefined = false;
masm.branchTestDouble(Assembler::Equal, tag, &isDouble);
masm.branchTestInt32(Assembler::Equal, tag, &isInt32);
if (mir->conversion() != MToFloat32::NumbersOnly) {
masm.branchTestBoolean(Assembler::Equal, tag, &isBool);
masm.branchTestUndefined(Assembler::Equal, tag, &isUndefined);
hasBoolean = true;
hasUndefined = true;
if (mir->conversion() != MToFloat32::NonNullNonStringPrimitives) {
masm.branchTestNull(Assembler::Equal, tag, &isNull);
hasNull = true;
}
}
if (!bailout(lir->snapshot()))
return false;
if (hasNull) {
static float DoubleZeroFloat = DoubleZero;
masm.bind(&isNull);
masm.loadStaticFloat32(&DoubleZeroFloat, output);
masm.jump(&done);
}
if (hasUndefined) {
static float js_NaN_float = js_NaN;
masm.bind(&isUndefined);
masm.loadStaticFloat32(&js_NaN_float, output);
masm.jump(&done);
}
if (hasBoolean) {
masm.bind(&isBool);
masm.boolValueToFloat32(operand, output);
masm.jump(&done);
}
masm.bind(&isInt32);
masm.int32ValueToFloat32(operand, output);
masm.jump(&done);
masm.bind(&isDouble);
masm.unboxDouble(operand, output);
masm.convertDoubleToFloat(output, output);
masm.bind(&done);
return true;
}
bool
CodeGenerator::visitInt32ToDouble(LInt32ToDouble *lir)
{
@ -370,27 +309,6 @@ CodeGenerator::visitInt32ToDouble(LInt32ToDouble *lir)
return true;
}
bool
CodeGenerator::visitFloat32ToDouble(LFloat32ToDouble *lir)
{
masm.convertFloatToDouble(ToFloatRegister(lir->input()), ToFloatRegister(lir->output()));
return true;
}
bool
CodeGenerator::visitDoubleToFloat32(LDoubleToFloat32 *lir)
{
masm.convertDoubleToFloat(ToFloatRegister(lir->input()), ToFloatRegister(lir->output()));
return true;
}
bool
CodeGenerator::visitInt32ToFloat32(LInt32ToFloat32 *lir)
{
masm.convertInt32ToFloat32(ToRegister(lir->input()), ToFloatRegister(lir->output()));
return true;
}
bool
CodeGenerator::visitDoubleToInt32(LDoubleToInt32 *lir)
{
@ -7506,19 +7424,6 @@ CodeGenerator::visitAssertRangeD(LAssertRangeD *ins)
return emitAssertRangeD(r, input, temp);
}
bool
CodeGenerator::visitAssertRangeF(LAssertRangeF *ins)
{
FloatRegister input = ToFloatRegister(ins->input());
FloatRegister temp = ToFloatRegister(ins->temp());
Range *r = ins->range();
masm.convertFloatToDouble(input, input);
bool success = emitAssertRangeD(r, input, temp);
masm.convertDoubleToFloat(input, input);
return success;
}
bool
CodeGenerator::visitAssertRangeV(LAssertRangeV *ins)
{

5
js/src/jit/CodeGenerator.h
View File

@ -71,10 +71,6 @@ class CodeGenerator : public CodeGeneratorSpecific
bool visitMoveGroup(LMoveGroup *group);
bool visitValueToInt32(LValueToInt32 *lir);
bool visitValueToDouble(LValueToDouble *lir);
bool visitValueToFloat32(LValueToFloat32 *lir);
bool visitFloat32ToDouble(LFloat32ToDouble *lir);
bool visitDoubleToFloat32(LDoubleToFloat32 *lir);
bool visitInt32ToFloat32(LInt32ToFloat32 *lir);
bool visitInt32ToDouble(LInt32ToDouble *lir);
void emitOOLTestObject(Register objreg, Label *ifTruthy, Label *ifFalsy, Register scratch);
bool visitTestOAndBranch(LTestOAndBranch *lir);
@ -308,7 +304,6 @@ class CodeGenerator : public CodeGeneratorSpecific
bool visitAssertRangeI(LAssertRangeI *ins);
bool visitAssertRangeD(LAssertRangeD *ins);
bool visitAssertRangeF(LAssertRangeF *ins);
bool visitAssertRangeV(LAssertRangeV *ins);
IonScriptCounts *extractUnassociatedScriptCounts() {

265
js/src/jit/IonAnalysis.cpp
View File

@ -12,7 +12,6 @@
#include "jit/Ion.h"
#include "jit/IonBuilder.h"
#include "jit/LIR.h"
#include "jit/Lowering.h"
#include "jit/MIRGraph.h"
#include "jsinferinlines.h"
@ -401,12 +400,6 @@ class TypeAnalyzer
bool adjustInputs(MDefinition *def);
bool insertConversions();
bool graphContainsFloat32();
bool markPhiConsumers();
bool markPhiProducers();
bool specializeValidFloatOps();
bool tryEmitFloatOperations();
public:
TypeAnalyzer(MIRGenerator *mir, MIRGraph &graph)
: mir(mir), graph(graph)
@ -422,7 +415,6 @@ static MIRType
GuessPhiType(MPhi *phi)
{
MIRType type = MIRType_None;
bool convertibleToFloat32 = false;
for (size_t i = 0, e = phi->numOperands(); i < e; i++) {
MDefinition *in = phi->getOperand(i);
if (in->isPhi()) {
@ -437,8 +429,6 @@ GuessPhiType(MPhi *phi)
}
if (type == MIRType_None) {
type = in->type();
if (in->isConstant())
convertibleToFloat32 = true;
continue;
}
if (type != in->type()) {
@ -446,20 +436,11 @@ GuessPhiType(MPhi *phi)
if (in->resultTypeSet() && in->resultTypeSet()->empty())
continue;
if (IsFloatType(type) && IsFloatType(in->type())) {
// Specialize phis with int32 and float32 operands as float32.
type = MIRType_Float32;
} else if (convertibleToFloat32 && in->type() == MIRType_Float32) {
// If we only saw constants before and encounter a Float32 value, promote previous
// constants to Float32
type = MIRType_Float32;
} else if (IsNumberType(type) && IsNumberType(in->type())) {
// Specialize phis with int32 and double operands as double.
// Specialize phis with int32 and double operands as double.
if (IsNumberType(type) && IsNumberType(in->type()))
type = MIRType_Double;
convertibleToFloat32 &= in->isConstant();
} else {
else
return MIRType_Value;
}
}
}
return type;
@ -495,13 +476,6 @@ TypeAnalyzer::propagateSpecialization(MPhi *phi)
continue;
}
if (use->type() != phi->type()) {
// Specialize phis with int32 and float operands as floats.
if (IsFloatType(use->type()) && IsFloatType(phi->type())) {
if (!respecialize(use, MIRType_Float32))
return false;
continue;
}
// Specialize phis with int32 and double operands as double.
if (IsNumberType(use->type()) && IsNumberType(phi->type())) {
if (!respecialize(use, MIRType_Double))
@ -572,24 +546,9 @@ TypeAnalyzer::adjustPhiInputs(MPhi *phi)
} else {
MInstruction *replacement;
if (phiType == MIRType_Double && IsFloatType(in->type())) {
if (phiType == MIRType_Double && in->type() == MIRType_Int32) {
// Convert int32 operands to double.
replacement = MToDouble::New(in);
} else if (phiType == MIRType_Float32) {
if (in->type() == MIRType_Int32 || in->type() == MIRType_Double) {
replacement = MToFloat32::New(in);
} else {
// See comment below
if (in->type() != MIRType_Value) {
MBox *box = MBox::New(in);
in->block()->insertBefore(in->block()->lastIns(), box);
in = box;
}
MUnbox *unbox = MUnbox::New(in, MIRType_Double, MUnbox::Fallible);
in->block()->insertBefore(in->block()->lastIns(), unbox);
replacement = MToFloat32::New(in);
}
} else {
// If we know this branch will fail to convert to phiType,
// insert a box that'll immediately fail in the fallible unbox
@ -624,7 +583,8 @@ TypeAnalyzer::adjustPhiInputs(MPhi *phi)
// the original box.
phi->replaceOperand(i, in->toUnbox()->input());
} else {
MDefinition *box = BoxInputsPolicy::alwaysBoxAt(in->block()->lastIns(), in);
MBox *box = MBox::New(in);
in->block()->insertBefore(in->block()->lastIns(), box);
phi->replaceOperand(i, box);
}
}
@ -690,222 +650,9 @@ TypeAnalyzer::insertConversions()
return true;
}
// This function tries to emit Float32 specialized operations whenever it's possible.
// MIR nodes are flagged as:
// - Producers, when they can create Float32 that might need to be coerced into a Double.
// Loads in Float32 arrays and conversions to Float32 are producers.
// - Consumers, when they can have Float32 as inputs and validate a legal use of a Float32.
// Stores in Float32 arrays and conversions to Float32 are consumers.
// - Float32 commutative, when using the Float32 instruction instead of the Double instruction
// does not result in a compound loss of precision. This is the case for +, -, /, * with 2
// operands, for instance. However, an addition with 3 operands is not commutative anymore,
// so an intermediate coercion is needed.
// Except for phis, all these flags are known after Ion building, so they cannot change during
// the process.
//
// The idea behind the algorithm is easy: whenever we can prove that a commutative operation
// has only producers as inputs and consumers as uses, we can specialize the operation as a
// float32 operation. Otherwise, we have to convert all float32 inputs to doubles. Even
// if a lot of conversions are produced, GVN will take care of eliminating the redundant ones.
//
// Phis have a special status. Phis need to be flagged as producers or consumers as they can
// be inputs or outputs of commutative instructions. Fortunately, producers and consumers
// properties are such that we can deduce the property using all non phis inputs first (which form
// an initial phi graph) and then propagate all properties from one phi to another using a
// fixed point algorithm. The algorithm is ensured to terminate as each iteration has less or as
// many flagged phis as the previous iteration (so the worst steady state case is all phis being
// flagged as false).
//
// In a nutshell, the algorithm applies three passes:
// 1 - Determine which phis are consumers. Each phi gets an initial value by making a global AND on
// all its non-phi inputs. Then each phi propagates its value to other phis. If after propagation,
// the flag value changed, we have to reapply the algorithm on all phi operands, as a phi is a
// consumer if all of its uses are consumers.
// 2 - Determine which phis are producers. It's the same algorithm, except that we have to reapply
// the algorithm on all phi uses, as a phi is a producer if all of its operands are producers.
// 3 - Go through all commutative operations and ensure their inputs are all producers and their
// uses are all consumers.
bool
TypeAnalyzer::markPhiConsumers()
{
JS_ASSERT(phiWorklist_.empty());
// Iterate in postorder so worklist is initialized to RPO.
for (PostorderIterator block(graph.poBegin()); block != graph.poEnd(); ++block) {
if (mir->shouldCancel("Ensure Float32 commutativity - Consumer Phis - Initial state"))
return false;
for (MPhiIterator phi(block->phisBegin()); phi != block->phisEnd(); ++phi) {
JS_ASSERT(!phi->isInWorklist());
bool canConsumeFloat32 = true;
for (MUseDefIterator use(*phi); canConsumeFloat32 && use; use++) {
MDefinition *usedef = use.def();
canConsumeFloat32 &= usedef->isPhi() || usedef->canConsumeFloat32();
}
phi->setCanConsumeFloat32(canConsumeFloat32);
if (canConsumeFloat32 && !addPhiToWorklist(*phi))
return false;
}
}
while (!phiWorklist_.empty()) {
if (mir->shouldCancel("Ensure Float32 commutativity - Consumer Phis - Fixed point"))
return false;
MPhi *phi = popPhi();
JS_ASSERT(phi->canConsumeFloat32());
bool validConsumer = true;
for (MUseDefIterator use(phi); use; use++) {
MDefinition *def = use.def();
if (def->isPhi() && !def->canConsumeFloat32()) {
validConsumer = false;
break;
}
}
if (validConsumer)
continue;
// Propagate invalidated phis
phi->setCanConsumeFloat32(false);
for (size_t i = 0, e = phi->numOperands(); i < e; ++i) {
MDefinition *input = phi->getOperand(i);
if (input->isPhi() && !input->isInWorklist() && input->canConsumeFloat32())
{
if (!addPhiToWorklist(input->toPhi()))
return false;
}
}
}
return true;
}
bool
TypeAnalyzer::markPhiProducers()
{
JS_ASSERT(phiWorklist_.empty());
// Iterate in reverse postorder so worklist is initialized to PO.
for (ReversePostorderIterator block(graph.rpoBegin()); block != graph.rpoEnd(); ++block) {
if (mir->shouldCancel("Ensure Float32 commutativity - Producer Phis - initial state"))
return false;
for (MPhiIterator phi(block->phisBegin()); phi != block->phisEnd(); ++phi) {
JS_ASSERT(!phi->isInWorklist());
bool canProduceFloat32 = true;
for (size_t i = 0, e = phi->numOperands(); canProduceFloat32 && i < e; ++i) {
MDefinition *input = phi->getOperand(i);
canProduceFloat32 &= input->isPhi() || input->canProduceFloat32();
}
phi->setCanProduceFloat32(canProduceFloat32);
if (canProduceFloat32 && !addPhiToWorklist(*phi))
return false;
}
}
while (!phiWorklist_.empty()) {
if (mir->shouldCancel("Ensure Float32 commutativity - Producer Phis - Fixed point"))
return false;
MPhi *phi = popPhi();
JS_ASSERT(phi->canProduceFloat32());
bool validProducer = true;
for (size_t i = 0, e = phi->numOperands(); i < e; ++i) {
MDefinition *input = phi->getOperand(i);
if (input->isPhi() && !input->canProduceFloat32()) {
validProducer = false;
break;
}
}
if (validProducer)
continue;
// Propagate invalidated phis
phi->setCanProduceFloat32(false);
for (MUseDefIterator use(phi); use; use++) {
MDefinition *def = use.def();
if (def->isPhi() && !def->isInWorklist() && def->canProduceFloat32())
{
if (!addPhiToWorklist(def->toPhi()))
return false;
}
}
}
return true;
}
bool
TypeAnalyzer::specializeValidFloatOps()
{
for (ReversePostorderIterator block(graph.rpoBegin()); block != graph.rpoEnd(); ++block) {
if (mir->shouldCancel("Ensure Float32 commutativity - Instructions"))
return false;
for (MInstructionIterator ins(block->begin()); ins != block->end(); ++ins) {
if (!ins->isFloat32Commutative())
continue;
if (ins->type() == MIRType_Float32)
continue;
// This call will try to specialize the instruction iff all uses are consumers and
// all inputs are producers.
ins->trySpecializeFloat32();
}
}
return true;
}
bool
TypeAnalyzer::graphContainsFloat32()
{
for (ReversePostorderIterator block(graph.rpoBegin()); block != graph.rpoEnd(); ++block) {
if (mir->shouldCancel("Ensure Float32 commutativity - Graph contains Float32"))
return false;
for (MDefinitionIterator def(*block); def; def++) {
if (def->type() == MIRType_Float32)
return true;
}
}
return false;
}
bool
TypeAnalyzer::tryEmitFloatOperations()
{
// Backends that currently don't know how to generate Float32 specialized instructions
// shouldn't run this pass and just let all instructions as specialized for Double.
if (!LIRGenerator::allowFloat32Optimizations())
return true;
// Asm.js uses the ahead of time type checks to specialize operations, no need to check
// them again at this point.
if (mir->compilingAsmJS())
return true;
// Check ahead of time that there is at least one definition typed as Float32, otherwise we
// don't need this pass.
if (!graphContainsFloat32())
return true;
if (!markPhiConsumers())
return false;
if (!markPhiProducers())
return false;
if (!specializeValidFloatOps())
return false;
return true;
}
bool
TypeAnalyzer::analyze()
{
if (!tryEmitFloatOperations())
return false;
if (!specializePhis())
return false;
if (!insertConversions())

3
js/src/jit/IonBuilder.cpp
View File

@ -6339,7 +6339,6 @@ jit::TypeSetIncludes(types::TypeSet *types, MIRType input, types::TypeSet *input
case MIRType_Boolean:
case MIRType_Int32:
case MIRType_Double:
case MIRType_Float32:
case MIRType_String:
case MIRType_Magic:
return types->hasType(types::Type::PrimitiveType(ValueTypeFromMIRType(input)));
@ -7058,8 +7057,6 @@ IonBuilder::jsop_getelem_typed(MDefinition *obj, MDefinition *index,
knownType = allowDouble ? MIRType_Double : MIRType_Int32;
break;
case ScalarTypeRepresentation::TYPE_FLOAT32:
knownType = (LIRGenerator::allowFloat32Optimizations()) ? MIRType_Float32 : MIRType_Double;
break;
case ScalarTypeRepresentation::TYPE_FLOAT64:
knownType = MIRType_Double;
break;

16
js/src/jit/IonFrames.cpp
View File

@ -1241,22 +1241,6 @@ SnapshotIterator::slotValue(const Slot &slot)
case SnapshotReader::DOUBLE_REG:
return DoubleValue(machine_.read(slot.floatReg()));
case SnapshotReader::FLOAT32_REG:
{
double asDouble = machine_.read(slot.floatReg());
// The register contains the encoding of a float32. We just read
// the bits without making any conversion.
float asFloat = *(float*) &asDouble;
return DoubleValue(asFloat);
}
case SnapshotReader::FLOAT32_STACK:
{
double asDouble = ReadFrameDoubleSlot(fp_, slot.stackSlot());
float asFloat = *(float*) &asDouble; // no conversion, see comment above.
return DoubleValue(asFloat);
}
case SnapshotReader::TYPED_REG:
return FromTypedPayload(slot.knownType(), machine_.read(slot.reg()));

54
js/src/jit/IonMacroAssembler.cpp
View File

@ -15,7 +15,6 @@
#include "jit/BaselineIC.h"
#include "jit/BaselineJIT.h"
#include "jit/BaselineRegisters.h"
#include "jit/Lowering.h"
#include "jit/MIR.h"
#include "vm/ForkJoin.h"
@ -279,41 +278,6 @@ MacroAssembler::moveNurseryPtr(const ImmMaybeNurseryPtr &ptr, const Register &re
movePtr(ptr, reg);
}
template<typename S, typename T>
static void
StoreToTypedFloatArray(MacroAssembler &masm, int arrayType, const S &value, const T &dest) {
switch (arrayType) {
case ScalarTypeRepresentation::TYPE_FLOAT32:
if (LIRGenerator::allowFloat32Optimizations()) {
masm.storeFloat(value, dest);
} else {
#ifdef JS_MORE_DETERMINISTIC
// See the comment in ToDoubleForTypedArray.
masm.canonicalizeDouble(value);
#endif
masm.convertDoubleToFloat(value, ScratchFloatReg);
masm.storeFloat(ScratchFloatReg, dest);
}
break;
case ScalarTypeRepresentation::TYPE_FLOAT64:
#ifdef JS_MORE_DETERMINISTIC
// See the comment in ToDoubleForTypedArray.
masm.canonicalizeDouble(value);
#endif
masm.storeDouble(value, dest);
break;
default:
MOZ_ASSUME_UNREACHABLE("Invalid typed array type");
}
}
void MacroAssembler::storeToTypedFloatArray(int arrayType, const FloatRegister &value, const BaseIndex &dest) {
StoreToTypedFloatArray(*this, arrayType, value, dest);
}
void MacroAssembler::storeToTypedFloatArray(int arrayType, const FloatRegister &value, const Address &dest) {
StoreToTypedFloatArray(*this, arrayType, value, dest);
}
template<typename T>
void
MacroAssembler::loadFromTypedArray(int arrayType, const T &src, AnyRegister dest, Register temp,
@ -347,16 +311,11 @@ MacroAssembler::loadFromTypedArray(int arrayType, const T &src, AnyRegister dest
}
break;
case ScalarTypeRepresentation::TYPE_FLOAT32:
if (LIRGenerator::allowFloat32Optimizations()) {
loadFloat(src, dest.fpu());
canonicalizeFloat(dest.fpu());
} else {
loadFloatAsDouble(src, dest.fpu());
canonicalizeDouble(dest.fpu());
}
break;
case ScalarTypeRepresentation::TYPE_FLOAT64:
loadDouble(src, dest.fpu());
if (arrayType == ScalarTypeRepresentation::TYPE_FLOAT32)
loadFloatAsDouble(src, dest.fpu());
else
loadDouble(src, dest.fpu());
canonicalizeDouble(dest.fpu());
break;
default:
@ -410,11 +369,6 @@ MacroAssembler::loadFromTypedArray(int arrayType, const T &src, const ValueOpera
}
break;
case ScalarTypeRepresentation::TYPE_FLOAT32:
loadFromTypedArray(arrayType, src, AnyRegister(ScratchFloatReg), dest.scratchReg(), NULL);
if (LIRGenerator::allowFloat32Optimizations())
convertFloatToDouble(ScratchFloatReg, ScratchFloatReg);
boxDouble(ScratchFloatReg, dest);
break;
case ScalarTypeRepresentation::TYPE_FLOAT64:
loadFromTypedArray(arrayType, src, AnyRegister(ScratchFloatReg), dest.scratchReg(), NULL);
boxDouble(ScratchFloatReg, dest);

30
js/src/jit/IonMacroAssembler.h
View File

@ -427,7 +427,7 @@ class MacroAssembler : public MacroAssemblerSpecific
void Push(TypedOrValueRegister v) {
if (v.hasValue())
Push(v.valueReg());
else if (IsFloatingPointType(v.type()))
else if (v.type() == MIRType_Double)
Push(v.typedReg().fpu());
else
Push(ValueTypeFromMIRType(v.type()), v.typedReg().gpr());
@ -558,14 +558,6 @@ class MacroAssembler : public MacroAssemblerSpecific
bind(&notNaN);
}
void canonicalizeFloat(FloatRegister reg) {
static float js_NaN_float = js_NaN;
Label notNaN;
branchFloat(DoubleOrdered, reg, reg, &notNaN);
loadStaticFloat32(&js_NaN_float, reg);
bind(&notNaN);
}
template<typename T>
void loadFromTypedArray(int arrayType, const T &src, AnyRegister dest, Register temp, Label *fail);
@ -594,8 +586,24 @@ class MacroAssembler : public MacroAssemblerSpecific
}
}
void storeToTypedFloatArray(int arrayType, const FloatRegister &value, const BaseIndex &dest);
void storeToTypedFloatArray(int arrayType, const FloatRegister &value, const Address &dest);
template<typename T>
void storeToTypedFloatArray(int arrayType, FloatRegister value, const T &dest) {
#ifdef JS_MORE_DETERMINISTIC
// See the comment in ToDoubleForTypedArray.
canonicalizeDouble(value);
#endif
switch (arrayType) {
case ScalarTypeRepresentation::TYPE_FLOAT32:
convertDoubleToFloat(value, ScratchFloatReg);
storeFloat(ScratchFloatReg, dest);
break;
case ScalarTypeRepresentation::TYPE_FLOAT64:
storeDouble(value, dest);
break;
default:
MOZ_ASSUME_UNREACHABLE("Invalid typed array type");
}
}
Register extractString(const Address &address, Register scratch) {
return extractObject(address, scratch);

18
js/src/jit/IonTypes.h
View File

@ -83,7 +83,6 @@ enum MIRType
MIRType_Boolean,
MIRType_Int32,
MIRType_Double,
MIRType_Float32,
MIRType_String,
MIRType_Object,
MIRType_Magic,
@ -135,7 +134,6 @@ ValueTypeFromMIRType(MIRType type)
return JSVAL_TYPE_BOOLEAN;
case MIRType_Int32:
return JSVAL_TYPE_INT32;
case MIRType_Float32: // Fall through, there's no JSVAL for Float32
case MIRType_Double:
return JSVAL_TYPE_DOUBLE;
case MIRType_String:
@ -168,8 +166,6 @@ StringFromMIRType(MIRType type)
return "Int32";
case MIRType_Double:
return "Double";
case MIRType_Float32:
return "Float32";
case MIRType_String:
return "String";
case MIRType_Object:
@ -196,19 +192,7 @@ StringFromMIRType(MIRType type)
static inline bool
IsNumberType(MIRType type)
{
return type == MIRType_Int32 || type == MIRType_Double || type == MIRType_Float32;
}
static inline bool
IsFloatType(MIRType type)
{
return type == MIRType_Int32 || type == MIRType_Float32;
}
static inline bool
IsFloatingPointType(MIRType type)
{
return type == MIRType_Double || type == MIRType_Float32;
return type == MIRType_Int32 || type == MIRType_Double;
}
static inline bool

2
js/src/jit/LICM.cpp
View File

@ -248,7 +248,7 @@ Loop::requiresHoistedUse(const MDefinition *ins) const
// hoisting on their own, in general. Floating-point constants typically
// are worth hoisting, unless they'll end up being spilled (eg. due to a
// call).
if (ins->isConstant() && (IsFloatingPointType(ins->type()) || containsPossibleCall_))
if (ins->isConstant() && (ins->type() != MIRType_Double || containsPossibleCall_))
return true;
return false;

114
js/src/jit/LIR-Common.h
View File

@ -188,22 +188,6 @@ class LDouble : public LInstructionHelper<1, 0, 0>
}
};
// Constant float32.
class LFloat32 : public LInstructionHelper<1, 0, 0>
{
float f_;
public:
LIR_HEADER(Float32);
LFloat32(float f)
: f_(f)
{ }
float getFloat() const {
return f_;
}
};
// A constant Value.
class LValue : public LInstructionHelper<BOX_PIECES, 0, 0>
{
@ -2118,16 +2102,6 @@ class LNegD : public LInstructionHelper<1, 1, 0>
}
};
// Negative of a float32.
class LNegF : public LInstructionHelper<1, 1, 0>
{
public:
LIR_HEADER(NegF)
LNegF(const LAllocation &num) {
setOperand(0, num);
}
};
// Absolute value of an integer.
class LAbsI : public LInstructionHelper<1, 1, 0>
{
@ -2328,23 +2302,6 @@ class LMathD : public LBinaryMath<0>
}
};
// Performs an add, sub, mul, or div on two double values.
class LMathF: public LBinaryMath<0>
{
JSOp jsop_;
public:
LIR_HEADER(MathF)
LMathF(JSOp jsop)
: jsop_(jsop)
{ }
JSOp jsop() const {
return jsop_;
}
};
class LModD : public LBinaryMath<1>
{
public:
@ -2501,39 +2458,6 @@ class LInt32ToDouble : public LInstructionHelper<1, 1, 0>
}
};
// Convert a 32-bit float to a double.
class LFloat32ToDouble : public LInstructionHelper<1, 1, 0>
{
public:
LIR_HEADER(Float32ToDouble)
LFloat32ToDouble(const LAllocation &input) {
setOperand(0, input);
}
};
// Convert a double to a 32-bit float.
class LDoubleToFloat32 : public LInstructionHelper<1, 1, 0>
{
public:
LIR_HEADER(DoubleToFloat32)
LDoubleToFloat32(const LAllocation &input) {
setOperand(0, input);
}
};
// Convert a 32-bit integer to a float32.
class LInt32ToFloat32 : public LInstructionHelper<1, 1, 0>
{
public:
LIR_HEADER(Int32ToFloat32)
LInt32ToFloat32(const LAllocation &input) {
setOperand(0, input);
}
};
// Convert a value to a double.
class LValueToDouble : public LInstructionHelper<1, BOX_PIECES, 0>
{
@ -2546,18 +2470,6 @@ class LValueToDouble : public LInstructionHelper<1, BOX_PIECES, 0>
}
};
// Convert a value to a float32.
class LValueToFloat32 : public LInstructionHelper<1, BOX_PIECES, 0>
{
public:
LIR_HEADER(ValueToFloat32)
static const size_t Input = 0;
MToFloat32 *mir() {
return mir_->toToFloat32();
}
};
// Convert a value to an int32.
// Input: components of a Value
// Output: 32-bit integer
@ -5071,32 +4983,6 @@ class LAssertRangeD : public LInstructionHelper<0, 1, 1>
}
};
class LAssertRangeF : public LInstructionHelper<0, 1, 1>
{
public:
LIR_HEADER(AssertRangeF)
LAssertRangeF(const LAllocation &input, const LDefinition &temp) {
setOperand(0, input);
setTemp(0, temp);
}
const LAllocation *input() {
return getOperand(0);
}
const LDefinition *temp() {
return getTemp(0);
}
MAssertRange *mir() {
return mir_->toAssertRange();
}
Range *range() {
return mir()->range();
}
};
class LAssertRangeV : public LInstructionHelper<0, BOX_PIECES, 3>
{
public:

1
js/src/jit/LIR.h
View File

@ -540,7 +540,6 @@ class LDefinition
case MIRType_Object:
return LDefinition::OBJECT;
case MIRType_Double:
case MIRType_Float32:
return LDefinition::DOUBLE;
#if defined(JS_PUNBOX64)
case MIRType_Value:

8
js/src/jit/LOpcodes.h
View File

@ -15,7 +15,6 @@
_(Integer) \
_(Pointer) \
_(Double) \
_(Float32) \
_(Value) \
_(Parameter) \
_(Callee) \
@ -93,7 +92,6 @@
_(MinMaxD) \
_(NegI) \
_(NegD) \
_(NegF) \
_(AbsI) \
_(AbsD) \
_(SqrtD) \
@ -110,7 +108,6 @@
_(SubI) \
_(MulI) \
_(MathD) \
_(MathF) \
_(ModD) \
_(BinaryV) \
_(Concat) \
@ -118,12 +115,8 @@
_(CharCodeAt) \
_(FromCharCode) \
_(Int32ToDouble) \
_(Float32ToDouble) \
_(DoubleToFloat32) \
_(Int32ToFloat32) \
_(ValueToDouble) \
_(ValueToInt32) \
_(ValueToFloat32) \
_(DoubleToInt32) \
_(TruncateDToInt32) \
_(IntToString) \
@ -255,7 +248,6 @@
_(CheckInterruptPar) \
_(AssertRangeI) \
_(AssertRangeD) \
_(AssertRangeF) \
_(AssertRangeV)
#if defined(JS_CPU_X86)

91
js/src/jit/Lowering.cpp
View File

@ -1241,12 +1241,6 @@ LIRGenerator::visitAdd(MAdd *ins)
return lowerForFPU(new LMathD(JSOP_ADD), ins, lhs, rhs);
}
if (ins->specialization() == MIRType_Float32) {
JS_ASSERT(lhs->type() == MIRType_Float32);
ReorderCommutative(&lhs, &rhs);
return lowerForFPU(new LMathF(JSOP_ADD), ins, lhs, rhs);
}
return lowerBinaryV(JSOP_ADD, ins);
}
@ -1275,10 +1269,6 @@ LIRGenerator::visitSub(MSub *ins)
JS_ASSERT(lhs->type() == MIRType_Double);
return lowerForFPU(new LMathD(JSOP_SUB), ins, lhs, rhs);
}
if (ins->specialization() == MIRType_Float32) {
JS_ASSERT(lhs->type() == MIRType_Float32);
return lowerForFPU(new LMathF(JSOP_SUB), ins, lhs, rhs);
}
return lowerBinaryV(JSOP_SUB, ins);
}
@ -1305,18 +1295,6 @@ LIRGenerator::visitMul(MMul *ins)
return lowerForFPU(new LMathD(JSOP_MUL), ins, lhs, rhs);
}
if (ins->specialization() == MIRType_Float32) {
JS_ASSERT(lhs->type() == MIRType_Float32);
ReorderCommutative(&lhs, &rhs);
// We apply the same optimizations as for doubles
if (lhs->isConstant() && lhs->toConstant()->value() == JS::Float32Value(-1.0f))
return defineReuseInput(new LNegF(useRegisterAtStart(rhs)), ins, 0);
if (rhs->isConstant() && rhs->toConstant()->value() == JS::Float32Value(-1.0f))
return defineReuseInput(new LNegF(useRegisterAtStart(lhs)), ins, 0);
return lowerForFPU(new LMathF(JSOP_MUL), ins, lhs, rhs);
}
return lowerBinaryV(JSOP_MUL, ins);
}
@ -1336,10 +1314,6 @@ LIRGenerator::visitDiv(MDiv *ins)
JS_ASSERT(lhs->type() == MIRType_Double);
return lowerForFPU(new LMathD(JSOP_DIV), ins, lhs, rhs);
}
if (ins->specialization() == MIRType_Float32) {
JS_ASSERT(lhs->type() == MIRType_Float32);
return lowerForFPU(new LMathF(JSOP_DIV), ins, lhs, rhs);
}
return lowerBinaryV(JSOP_DIV, ins);
}
@ -1532,12 +1506,6 @@ LIRGenerator::visitToDouble(MToDouble *convert)
return define(lir, convert);
}
case MIRType_Float32:
{
LFloat32ToDouble *lir = new LFloat32ToDouble(useRegister(opd));
return define(lir, convert);
}
case MIRType_Double:
return redefine(convert, opd);
@ -1548,56 +1516,6 @@ LIRGenerator::visitToDouble(MToDouble *convert)
}
}
bool
LIRGenerator::visitToFloat32(MToFloat32 *convert)
{
MDefinition *opd = convert->input();
mozilla::DebugOnly<MToFloat32::ConversionKind> conversion = convert->conversion();
switch (opd->type()) {
case MIRType_Value:
{
LValueToFloat32 *lir = new LValueToFloat32();
if (!useBox(lir, LValueToFloat32::Input, opd))
return false;
return assignSnapshot(lir) && define(lir, convert);
}
case MIRType_Null:
JS_ASSERT(conversion != MToFloat32::NonStringPrimitives);
return lowerConstantFloat32(0, convert);
case MIRType_Undefined:
JS_ASSERT(conversion != MToFloat32::NumbersOnly);
return lowerConstantFloat32(js_NaN, convert);
case MIRType_Boolean:
JS_ASSERT(conversion != MToFloat32::NumbersOnly);
/* FALLTHROUGH */
case MIRType_Int32:
{
LInt32ToFloat32 *lir = new LInt32ToFloat32(useRegister(opd));
return define(lir, convert);
}
case MIRType_Double:
{
LDoubleToFloat32 *lir = new LDoubleToFloat32(useRegister(opd));
return define(lir, convert);
}
case MIRType_Float32:
return redefine(convert, opd);
default:
// Objects might be effectful.
// Strings are complicated - we don't handle them yet.
MOZ_ASSUME_UNREACHABLE("unexpected type");
return false;
}
}
bool
LIRGenerator::visitToInt32(MToInt32 *convert)
{
@ -1904,9 +1822,6 @@ LIRGenerator::visitStoreSlot(MStoreSlot *ins)
case MIRType_Double:
return add(new LStoreSlotT(useRegister(ins->slots()), useRegister(ins->value())), ins);
case MIRType_Float32:
MOZ_ASSUME_UNREACHABLE("Float32 shouldn't be stored in a slot.");
default:
return add(new LStoreSlotT(useRegister(ins->slots()), useRegisterOrConstant(ins->value())),
ins);
@ -2304,7 +2219,7 @@ LIRGenerator::visitLoadTypedArrayElement(MLoadTypedArrayElement *ins)
// We need a temp register for Uint32Array with known double result.
LDefinition tempDef = LDefinition::BogusTemp();
if (ins->arrayType() == ScalarTypeRepresentation::TYPE_UINT32 && IsFloatingPointType(ins->type()))
if (ins->arrayType() == ScalarTypeRepresentation::TYPE_UINT32 && ins->type() == MIRType_Double)
tempDef = temp();
LLoadTypedArrayElement *lir = new LLoadTypedArrayElement(elements, index, tempDef);
@ -2552,10 +2467,6 @@ LIRGenerator::visitAssertRange(MAssertRange *ins)
lir = new LAssertRangeD(useRegister(input), tempFloat());
break;
case MIRType_Float32:
lir = new LAssertRangeF(useRegister(input), tempFloat());
break;
case MIRType_Value:
lir = new LAssertRangeV(tempToUnbox(), tempFloat(), tempFloat());
if (!useBox(lir, LAssertRangeV::Input, input))

1
js/src/jit/Lowering.h
View File

@ -153,7 +153,6 @@ class LIRGenerator : public LIRGeneratorSpecific
bool visitOsrValue(MOsrValue *value);
bool visitOsrScopeChain(MOsrScopeChain *object);
bool visitToDouble(MToDouble *convert);
bool visitToFloat32(MToFloat32 *convert);
bool visitToInt32(MToInt32 *convert);
bool visitTruncateToInt32(MTruncateToInt32 *truncate);
bool visitToString(MToString *convert);

4
js/src/jit/MCallOptimize.cpp
View File

@ -792,9 +792,9 @@ IonBuilder::inlineMathImul(CallInfo &callInfo)
if (returnType != MIRType_Int32)
return InliningStatus_NotInlined;
if (!IsNumberType(callInfo.getArg(0)->type()) || callInfo.getArg(0)->type() == MIRType_Float32)
if (!IsNumberType(callInfo.getArg(0)->type()))
return InliningStatus_NotInlined;
if (!IsNumberType(callInfo.getArg(1)->type()) || callInfo.getArg(1)->type() == MIRType_Float32)
if (!IsNumberType(callInfo.getArg(1)->type()))
return InliningStatus_NotInlined;
callInfo.unwrapArgs();

97
js/src/jit/MIR.cpp
View File

@ -452,12 +452,6 @@ MConstant::printOpcode(FILE *fp) const
case MIRType_Double:
fprintf(fp, "%f", value().toDouble());
break;
case MIRType_Float32:
{
float val = value().toDouble();
fprintf(fp, "%f", val);
break;
}
case MIRType_Object:
if (value().toObject().is<JSFunction>()) {
JSFunction *fun = &value().toObject().as<JSFunction>();
@ -489,28 +483,6 @@ MConstant::printOpcode(FILE *fp) const
}
}
// Needs a static function to avoid overzealous optimizations by certain compilers (MSVC).
static bool
IsFloat32Representable(double x)
{
float asFloat = static_cast<float>(x);
double floatAsDouble = static_cast<double>(asFloat);
return floatAsDouble == x;
}
bool
MConstant::canProduceFloat32() const
{
if (!IsNumberType(type()))
return false;
if (type() == MIRType_Int32)
return IsFloat32Representable(static_cast<double>(value_.toInt32()));
if (type() == MIRType_Double)
return IsFloat32Representable(value_.toDouble());
return true;
}
void
MControlInstruction::printOpcode(FILE *fp) const
{
@ -743,9 +715,7 @@ jit::MergeTypes(MIRType *ptype, types::StackTypeSet **ptypeSet,
if (newTypeSet && newTypeSet->empty())
return;
if (newType != *ptype) {
if (IsFloatType(newType) && IsFloatType(*ptype)) {
*ptype = MIRType_Float32;
} else if (IsNumberType(newType) && IsNumberType(*ptype)) {
if (IsNumberType(newType) && IsNumberType(*ptype)) {
*ptype = MIRType_Double;
} else if (*ptype != MIRType_Value) {
if (!*ptypeSet)
@ -1169,43 +1139,6 @@ MBinaryArithInstruction::foldsTo(bool useValueNumbers)
return this;
}
template<size_t Op> static void
ConvertDefinitionToDouble(MDefinition *def, MInstruction *consumer)
{
MInstruction *replace = MToDouble::New(def);
consumer->replaceOperand(Op, replace);
consumer->block()->insertBefore(consumer, replace);
}
static bool
CheckUsesAreFloat32Consumers(MInstruction *ins)
{
bool allConsumerUses = true;
for (MUseDefIterator use(ins); allConsumerUses && use; use++)
allConsumerUses &= use.def()->canConsumeFloat32();
return allConsumerUses;
}
void
MBinaryArithInstruction::trySpecializeFloat32()
{
MDefinition *left = lhs();
MDefinition *right = rhs();
if (!left->canProduceFloat32() || !right->canProduceFloat32()
|| !CheckUsesAreFloat32Consumers(this))
{
if (left->type() == MIRType_Float32)
ConvertDefinitionToDouble<0>(left, this);
if (right->type() == MIRType_Float32)
ConvertDefinitionToDouble<1>(right, this);
return;
}
specialization_ = MIRType_Float32;
setResultType(MIRType_Float32);
}
bool
MAbs::fallible() const
{
@ -1444,9 +1377,7 @@ MBinaryArithInstruction::infer(BaselineInspector *inspector,
// Don't specialize for neither-integer-nor-double results.
if (lhs == MIRType_Int32 && rhs == MIRType_Int32)
setResultType(MIRType_Int32);
// Double operations are prioritary over float32 operations (i.e. if any operand needs
// a double as an input, convert all operands to doubles)
else if (IsFloatingPointType(lhs) || IsFloatingPointType(rhs))
else if (lhs == MIRType_Double || rhs == MIRType_Double)
setResultType(MIRType_Double);
else
return inferFallback(inspector, pc);
@ -1471,7 +1402,7 @@ MBinaryArithInstruction::infer(BaselineInspector *inspector,
// Don't specialize values when result isn't double
if (lhs == MIRType_Value || rhs == MIRType_Value) {
if (!IsFloatingPointType(rval)) {
if (rval != MIRType_Double) {
specialization_ = MIRType_None;
return;
}
@ -2026,28 +1957,6 @@ MToDouble::foldsTo(bool useValueNumbers)
return this;
}
MDefinition *
MToFloat32::foldsTo(bool useValueNumbers)
{
if (input()->type() == MIRType_Float32)
return input();
// If x is a Float32, Float32(Double(x)) == x
if (input()->isToDouble() && input()->toToDouble()->input()->type() == MIRType_Float32)
return input()->toToDouble()->input();
if (input()->isConstant()) {
const Value &v = input()->toConstant()->value();
if (v.isNumber()) {
float out = v.toNumber();
MConstant *c = MConstant::New(DoubleValue(out));
c->setResultType(MIRType_Float32);
return c;
}
}
return this;
}
MDefinition *
MToString::foldsTo(bool useValueNumbers)
{

139
js/src/jit/MIR.h
View File

@ -453,13 +453,6 @@ class MDefinition : public MNode
return !resultTypeSet() || resultTypeSet()->mightBeType(ValueTypeFromMIRType(type));
}
// Float32 specialization operations (see big comment in IonAnalysis before the Float32
// specialization algorithm).
virtual bool isFloat32Commutative() const { return false; }
virtual bool canProduceFloat32() const { return false; }
virtual bool canConsumeFloat32() const { return false; }
virtual void trySpecializeFloat32() {}
// Returns the beginning of this definition's use chain.
MUseIterator usesBegin() const {
return uses_.begin();
@ -955,21 +948,8 @@ class MConstant : public MNullaryInstruction
return AliasSet::None();
}
bool updateForReplacement(MDefinition *def) {
MConstant *c = def->toConstant();
// During constant folding, we don't want to replace a float32
// value by a double value.
if (type() == MIRType_Float32)
return c->type() == MIRType_Float32;
if (type() == MIRType_Double)
return c->type() != MIRType_Float32;
return true;
}
void computeRange();
bool truncate();
bool canProduceFloat32() const;
};
class MParameter : public MNullaryInstruction
@ -1743,10 +1723,6 @@ class MCall
return getOperand(NumNonArgumentOperands + index);
}
void replaceArg(uint32_t index, MDefinition *def) {
replaceOperand(NumNonArgumentOperands + index, def);
}
void rootTargetScript(JSFunction *target) {
targetScript_.setRoot(target->nonLazyScript());
}
@ -2660,65 +2636,6 @@ class MToDouble
bool isOperandTruncated(size_t index) const;
};
// Converts a primitive (either typed or untyped) to a float32. If the input is
// not primitive at runtime, a bailout occurs.
class MToFloat32
: public MUnaryInstruction,
public ToDoublePolicy
{
public:
// Types of values which can be converted.
enum ConversionKind {
NonStringPrimitives,
NonNullNonStringPrimitives,
NumbersOnly
};
protected:
ConversionKind conversion_;
MToFloat32(MDefinition *def, ConversionKind conversion)
: MUnaryInstruction(def), conversion_(conversion)
{
setResultType(MIRType_Float32);
setMovable();
}
public:
INSTRUCTION_HEADER(ToFloat32)
static MToFloat32 *New(MDefinition *def, ConversionKind conversion = NonStringPrimitives) {
return new MToFloat32(def, conversion);
}
static MToFloat32 *NewAsmJS(MDefinition *def) {
return new MToFloat32(def, NonStringPrimitives);
}
ConversionKind conversion() const {
return conversion_;
}
TypePolicy *typePolicy() {
return this;
}
virtual MDefinition *foldsTo(bool useValueNumbers);
bool congruentTo(MDefinition *ins) const {
if (!ins->isToFloat32() || ins->toToFloat32()->conversion() != conversion())
return false;
return congruentIfOperandsEqual(ins);
}
AliasSet getAliasSet() const {
return AliasSet::None();
}
void computeRange();
bool truncate();
bool isOperandTruncated(size_t index) const;
bool canConsumeFloat32() const { return true; }
bool canProduceFloat32() const { return true; }
};
// Converts a uint32 to a double (coming from asm.js).
class MAsmJSUnsignedToDouble
: public MUnaryInstruction
@ -3184,8 +3101,6 @@ class MBinaryArithInstruction
setResultType(MIRType_Int32);
}
virtual void trySpecializeFloat32();
bool congruentTo(MDefinition *ins) const {
return MBinaryInstruction::congruentTo(ins);
}
@ -3561,8 +3476,6 @@ class MAdd : public MBinaryArithInstruction
return add;
}
bool isFloat32Commutative() const { return true; }
double getIdentity() {
return 0;
}
@ -3599,8 +3512,6 @@ class MSub : public MBinaryArithInstruction
return 0;
}
bool isFloat32Commutative() const { return true; }
bool fallible();
void computeRange();
bool truncate();
@ -3673,8 +3584,6 @@ class MMul : public MBinaryArithInstruction
return canBeNegativeZero_ || canOverflow();
}
bool isFloat32Commutative() const { return true; }
void computeRange();
bool truncate();
bool isOperandTruncated(size_t index) const;
@ -3743,8 +3652,6 @@ class MDiv : public MBinaryArithInstruction
return unsigned_;
}
bool isFloat32Commutative() const { return true; }
bool fallible();
bool truncate();
};
@ -3932,8 +3839,6 @@ class MPhi MOZ_FINAL : public MDefinition, public InlineForwardListNode<MPhi>
bool hasBackedgeType_;
bool triedToSpecialize_;
bool isIterator_;
bool canProduceFloat32_;
bool canConsumeFloat32_;
#if DEBUG
bool specialized_;
@ -3944,9 +3849,7 @@ class MPhi MOZ_FINAL : public MDefinition, public InlineForwardListNode<MPhi>
: slot_(slot),
hasBackedgeType_(false),
triedToSpecialize_(false),
isIterator_(false),
canProduceFloat32_(false),
canConsumeFloat32_(false)
isIterator_(false)
#if DEBUG
, specialized_(false)
, capacity_(0)
@ -4044,22 +3947,6 @@ class MPhi MOZ_FINAL : public MDefinition, public InlineForwardListNode<MPhi>
}
return first;
}
bool canProduceFloat32() const {
return canProduceFloat32_;
}
void setCanProduceFloat32(bool can) {
canProduceFloat32_ = can;
}
bool canConsumeFloat32() const {
return canConsumeFloat32_;
}
void setCanConsumeFloat32(bool can) {
canConsumeFloat32_ = can;
}
};
// The goal of a Beta node is to split a def at a conditionally taken
@ -5064,7 +4951,7 @@ class MStoreElementCommon
class MStoreElement
: public MAryInstruction<3>,
public MStoreElementCommon,
public MixPolicy<SingleObjectPolicy, NoFloatPolicy<2> >
public SingleObjectPolicy
{
bool needsHoleCheck_;
@ -5114,7 +5001,7 @@ class MStoreElement
class MStoreElementHole
: public MAryInstruction<4>,
public MStoreElementCommon,
public MixPolicy<SingleObjectPolicy, NoFloatPolicy<3> >
public SingleObjectPolicy
{
MStoreElementHole(MDefinition *object, MDefinition *elements,
MDefinition *index, MDefinition *value) {
@ -5314,8 +5201,6 @@ class MLoadTypedArrayElement
}
void computeRange();
bool canProduceFloat32() const { return arrayType_ == ScalarTypeRepresentation::TYPE_FLOAT32; }
};
// Load a value from a typed array. Out-of-bounds accesses are handled using
@ -5364,7 +5249,6 @@ class MLoadTypedArrayElementHole
AliasSet getAliasSet() const {
return AliasSet::Load(AliasSet::TypedArrayElement);
}
bool canProduceFloat32() const { return arrayType_ == ScalarTypeRepresentation::TYPE_FLOAT32; }
};
// Load a value fallibly or infallibly from a statically known typed array.
@ -5376,9 +5260,7 @@ class MLoadTypedArrayElementStatic
: MUnaryInstruction(ptr), typedArray_(typedArray), fallible_(true)
{
int type = typedArray_->type();
if (type == ScalarTypeRepresentation::TYPE_FLOAT32)
setResultType(MIRType_Float32);
else if (type == ScalarTypeRepresentation::TYPE_FLOAT64)
if (type == ScalarTypeRepresentation::TYPE_FLOAT32 || type == ScalarTypeRepresentation::TYPE_FLOAT64)
setResultType(MIRType_Double);
else
setResultType(MIRType_Int32);
@ -5417,7 +5299,6 @@ class MLoadTypedArrayElementStatic
void computeRange();
bool truncate();
bool canProduceFloat32() const { return typedArray_->type() == ScalarTypeRepresentation::TYPE_FLOAT32; }
};
class MStoreTypedArrayElement
@ -5481,8 +5362,6 @@ class MStoreTypedArrayElement
racy_ = true;
}
bool isOperandTruncated(size_t index) const;
bool canConsumeFloat32() const { return arrayType_ == ScalarTypeRepresentation::TYPE_FLOAT32; }
};
class MStoreTypedArrayElementHole
@ -5546,8 +5425,6 @@ class MStoreTypedArrayElementHole
return AliasSet::Store(AliasSet::TypedArrayElement);
}
bool isOperandTruncated(size_t index) const;
bool canConsumeFloat32() const { return arrayType_ == ScalarTypeRepresentation::TYPE_FLOAT32; }
};
// Store a value infallibly to a statically known typed array.
@ -5589,8 +5466,6 @@ class MStoreTypedArrayElementStatic :
return AliasSet::Store(AliasSet::TypedArrayElement);
}
bool isOperandTruncated(size_t index) const;
bool canConsumeFloat32() const { return typedArray_->type() == ScalarTypeRepresentation::TYPE_FLOAT32; }
};
// Compute an "effective address", i.e., a compound computation of the form:
@ -5710,7 +5585,7 @@ class MLoadFixedSlot
class MStoreFixedSlot
: public MBinaryInstruction,
public MixPolicy<SingleObjectPolicy, NoFloatPolicy<1> >
public SingleObjectPolicy
{
bool needsBarrier_;
size_t slot_;
@ -6531,7 +6406,7 @@ class MForkJoinSlice
// Store to vp[slot] (slots that are not inline in an object).
class MStoreSlot
: public MBinaryInstruction,
public MixPolicy<ObjectPolicy<0>, NoFloatPolicy<1> >
public SingleObjectPolicy
{
uint32_t slot_;
MIRType slotType_;
@ -6831,7 +6706,7 @@ class MCallSetProperty
class MSetPropertyCache
: public MSetPropertyInstruction,
public MixPolicy<SingleObjectPolicy, NoFloatPolicy<1> >
public SingleObjectPolicy
{
bool needsTypeBarrier_;

1
js/src/jit/MOpcodes.h
View File

@ -76,7 +76,6 @@ namespace jit {
_(GuardString) \
_(AssertRange) \
_(ToDouble) \
_(ToFloat32) \
_(ToInt32) \
_(TruncateToInt32) \
_(ToString) \

1
js/src/jit/ParallelSafetyAnalysis.cpp
View File

@ -163,7 +163,6 @@ class ParallelSafetyVisitor : public MInstructionVisitor
SAFE_OP(Unbox)
SAFE_OP(GuardObject)
SAFE_OP(ToDouble)
SAFE_OP(ToFloat32)
SAFE_OP(ToInt32)
SAFE_OP(TruncateToInt32)
SAFE_OP(MaybeToDoubleElement)

28
js/src/jit/RangeAnalysis.cpp
View File

@ -1105,12 +1105,6 @@ MToDouble::computeRange()
setRange(new Range(getOperand(0)));
}
void
MToFloat32::computeRange()
{
setRange(new Range(getOperand(0)));
}
void
MTruncateToInt32::computeRange()
{
@ -1835,20 +1829,6 @@ MToDouble::truncate()
return true;
}
bool
MToFloat32::truncate()
{
JS_ASSERT(type() == MIRType_Float32);
// We use the return type to flag that this MToFloat32 sould be replaced by a
// MTruncateToInt32 when modifying the graph.
setResultType(MIRType_Int32);
if (range())
range()->wrapAroundToInt32();
return true;
}
bool
MLoadTypedArrayElementStatic::truncate()
{
@ -1900,14 +1880,6 @@ MToDouble::isOperandTruncated(size_t index) const
return type() == MIRType_Int32;
}
bool
MToFloat32::isOperandTruncated(size_t index) const
{
// The return type is used to flag that we are replacing this Float32 by a
// Truncate of its operand if needed.
return type() == MIRType_Int32;
}
bool
MStoreTypedArrayElement::isOperandTruncated(size_t index) const
{

18
js/src/jit/SnapshotReader.h
View File

@ -57,8 +57,6 @@ class SnapshotReader
{
CONSTANT, // An index into the constant pool.
DOUBLE_REG, // Type is double, payload is in a register.
FLOAT32_REG, // Type is float32, payload is in a register.
FLOAT32_STACK, // Type is float32, payload is on the stack.
TYPED_REG, // Type is constant, payload is in a register.
TYPED_STACK, // Type is constant, payload is on the stack.
UNTYPED, // Type is not known.
@ -137,18 +135,6 @@ class SnapshotReader
{
fpu_ = reg.code();
}
Slot(SlotMode mode, const FloatRegister &reg)
: mode_(mode)
{
JS_ASSERT(mode == FLOAT32_REG);
fpu_ = reg.code();
}
Slot(SlotMode mode, const Location &loc)
: mode_(mode)
{
JS_ASSERT(mode == FLOAT32_STACK);
known_type_.payload = loc;
}
Slot(SlotMode mode)
: mode_(mode)
{ }
@ -180,11 +166,11 @@ class SnapshotReader
return known_type_.payload.reg();
}
FloatRegister floatReg() const {
JS_ASSERT(mode() == DOUBLE_REG || mode() == FLOAT32_REG);
JS_ASSERT(mode() == DOUBLE_REG);
return FloatRegister::FromCode(fpu_);
}
int32_t stackSlot() const {
JS_ASSERT(mode() == TYPED_STACK || mode() == FLOAT32_STACK);
JS_ASSERT(mode() == TYPED_STACK);
return known_type_.payload.stackSlot();
}
#if defined(JS_NUNBOX32)

2
js/src/jit/SnapshotWriter.h
View File

@ -46,8 +46,6 @@ class SnapshotWriter
void addUndefinedSlot();
void addNullSlot();
void addInt32Slot(int32_t value);
void addFloat32Slot(const FloatRegister &reg);
void addFloat32Slot(int32_t stackIndex);
void addConstantPoolSlot(uint32_t index);
#if defined(JS_NUNBOX32)
void addSlot(const Register &type, const Register &payload);

39
js/src/jit/Snapshots.cpp
View File

@ -56,16 +56,13 @@ using namespace js::jit;
//
// JSVAL_TYPE_NULL:
// Reg value:
// 0-27: Constant integer; Int32Value(n)
// 28: Variable float32; Float register code
// 29: Variable float32; Stack index
// 0-29: Constant integer; Int32Value(n)
// 30: NullValue()
// 31: Constant integer; Int32Value([vws])
//
// JSVAL_TYPE_UNDEFINED:
// Reg value:
// 0-27: Constant value, index n into ionScript->constants()
// 28-29: unused
// 0-29: Constant value, index n into ionScript->constants()
// 30: UndefinedValue()
// 31: Constant value, index [vwu] into
// ionScript->constants()
@ -175,12 +172,10 @@ static const uint32_t NUNBOX32_REG_REG = 3;
static const uint32_t MAX_TYPE_FIELD_VALUE = 7;
static const uint32_t MAX_REG_FIELD_VALUE = 31;
static const uint32_t ESC_REG_FIELD_INDEX = 31;
static const uint32_t ESC_REG_FIELD_CONST = 30;
static const uint32_t ESC_REG_FIELD_FLOAT32_STACK = 29;
static const uint32_t ESC_REG_FIELD_FLOAT32_REG = 28;
static const uint32_t MIN_REG_FIELD_ESC = 28;
static const uint32_t MAX_REG_FIELD_VALUE = 31;
static const uint32_t ESC_REG_FIELD_INDEX = 31;
static const uint32_t ESC_REG_FIELD_CONST = 30;
static const uint32_t MIN_REG_FIELD_ESC = 30;
SnapshotReader::Slot
SnapshotReader::readSlot()
@ -215,10 +210,6 @@ SnapshotReader::readSlot()
return Slot(JS_NULL);
if (code == ESC_REG_FIELD_INDEX)
return Slot(JS_INT32, reader_.readSigned());
if (code == ESC_REG_FIELD_FLOAT32_REG)
return Slot(FLOAT32_REG, FloatRegister::FromCode(reader_.readUnsigned()));
if (code == ESC_REG_FIELD_FLOAT32_STACK)
return Slot(FLOAT32_STACK, Location::From(reader_.readSigned()));
return Slot(JS_INT32, code);
case JSVAL_TYPE_UNDEFINED:
@ -362,7 +353,6 @@ SnapshotWriter::writeSlotHeader(JSValueType type, uint32_t regCode)
void
SnapshotWriter::addSlot(const FloatRegister &reg)
{
JS_ASSERT(reg.code() < MIN_REG_FIELD_ESC);
IonSpew(IonSpew_Snapshots, " slot %u: double (reg %s)", slotsWritten_, reg.name());
writeSlotHeader(JSVAL_TYPE_DOUBLE, reg.code());
@ -516,23 +506,6 @@ SnapshotWriter::addInt32Slot(int32_t value)
}
}
void
SnapshotWriter::addFloat32Slot(const FloatRegister &reg)
{
JS_ASSERT(reg.code() < MIN_REG_FIELD_ESC);
IonSpew(IonSpew_Snapshots, " slot %u: float32 (reg %s)", slotsWritten_, reg.name());
writeSlotHeader(JSVAL_TYPE_NULL, ESC_REG_FIELD_FLOAT32_REG);
writer_.writeUnsigned(reg.code());
}
void
SnapshotWriter::addFloat32Slot(int32_t stackIndex)
{
IonSpew(IonSpew_Snapshots, " slot %u: float32 (stack %d)", slotsWritten_, stackIndex);
writeSlotHeader(JSVAL_TYPE_NULL, ESC_REG_FIELD_FLOAT32_STACK);
writer_.writeSigned(stackIndex);
}
void
SnapshotWriter::addConstantPoolSlot(uint32_t index)
{

115
js/src/jit/TypePolicy.cpp
View File

@ -6,7 +6,6 @@
#include "jit/TypePolicy.h"
#include "jit/Lowering.h"
#include "jit/MIR.h"
#include "jit/MIRGraph.h"
@ -18,20 +17,7 @@ BoxInputsPolicy::boxAt(MInstruction *at, MDefinition *operand)
{
if (operand->isUnbox())
return operand->toUnbox()->input();
return alwaysBoxAt(at, operand);
}
MDefinition *
BoxInputsPolicy::alwaysBoxAt(MInstruction *at, MDefinition *operand)
{
MDefinition *boxedOperand = operand;
// Replace Float32 by double
if (operand->type() == MIRType_Float32) {
MInstruction *replace = MToDouble::New(operand);
operand->block()->insertBefore(at, replace);
boxedOperand = replace;
}
MBox *box = MBox::New(boxedOperand);
MBox *box = MBox::New(operand);
at->block()->insertBefore(at, box);
return box;
}
@ -54,7 +40,7 @@ ArithPolicy::adjustInputs(MInstruction *ins)
if (specialization_ == MIRType_None)
return BoxInputsPolicy::adjustInputs(ins);
JS_ASSERT(ins->type() == MIRType_Double || ins->type() == MIRType_Int32 || ins->type() == MIRType_Float32);
JS_ASSERT(ins->type() == MIRType_Double || ins->type() == MIRType_Int32);
for (size_t i = 0, e = ins->numOperands(); i < e; i++) {
MDefinition *in = ins->getOperand(i);
@ -73,8 +59,6 @@ ArithPolicy::adjustInputs(MInstruction *ins)
if (ins->type() == MIRType_Double)
replace = MToDouble::New(in);
else if (ins->type() == MIRType_Float32)
replace = MToFloat32::New(in);
else
replace = MToInt32::New(in);
@ -115,16 +99,6 @@ ComparePolicy::adjustInputs(MInstruction *def)
JS_ASSERT(def->isCompare());
MCompare *compare = def->toCompare();
// Convert Float32 operands to doubles
for (size_t i = 0; i < 2; i++) {
MDefinition *in = def->getOperand(i);
if (in->type() == MIRType_Float32) {
MInstruction *replace = MToDouble::New(in);
def->block()->insertBefore(def, replace);
def->replaceOperand(i, replace);
}
}
// Box inputs to get value
if (compare->compareType() == MCompare::Compare_Unknown ||
compare->compareType() == MCompare::Compare_Value)
@ -294,13 +268,6 @@ BitwisePolicy::adjustInputs(MInstruction *ins)
if (in->type() == MIRType_Object || in->type() == MIRType_String)
in = boxAt(ins, in);
if (in->type() == MIRType_Float32) {
MToDouble *replace = MToDouble::New(in);
ins->block()->insertBefore(ins, replace);
ins->replaceOperand(i, replace);
in = replace;
}
MInstruction *replace = MTruncateToInt32::New(in);
ins->block()->insertBefore(ins, replace);
ins->replaceOperand(i, replace);
@ -398,61 +365,6 @@ DoublePolicy<Op>::staticAdjustInputs(MInstruction *def)
template bool DoublePolicy<0>::staticAdjustInputs(MInstruction *def);
template bool DoublePolicy<1>::staticAdjustInputs(MInstruction *def);
template <unsigned Op>
bool
Float32Policy<Op>::staticAdjustInputs(MInstruction *def)
{
MDefinition *in = def->getOperand(Op);
if (in->type() == MIRType_Float32)
return true;
// Force a bailout. Objects may be effectful; strings are currently unhandled.
if (in->type() == MIRType_Object || in->type() == MIRType_String) {
MToDouble *toDouble = MToDouble::New(in);
def->block()->insertBefore(def, toDouble);
MBox *box = MBox::New(toDouble);
def->block()->insertBefore(def, box);
MUnbox *unbox = MUnbox::New(box, MIRType_Double, MUnbox::Fallible);
def->block()->insertBefore(def, unbox);
MToFloat32 *toFloat32 = MToFloat32::New(unbox);
def->block()->insertBefore(def, toFloat32);
def->replaceOperand(Op, unbox);
return true;
}
MToFloat32 *replace = MToFloat32::New(in);
def->block()->insertBefore(def, replace);
def->replaceOperand(Op, replace);
return true;
}
template bool Float32Policy<0>::staticAdjustInputs(MInstruction *def);
template bool Float32Policy<1>::staticAdjustInputs(MInstruction *def);
template bool Float32Policy<2>::staticAdjustInputs(MInstruction *def);
template <unsigned Op>
bool
NoFloatPolicy<Op>::staticAdjustInputs(MInstruction *def)
{
MDefinition *in = def->getOperand(Op);
if (in->type() == MIRType_Float32) {
MToDouble *replace = MToDouble::New(in);
def->block()->insertBefore(def, replace);
def->replaceOperand(Op, replace);
}
return true;
}
template bool NoFloatPolicy<0>::staticAdjustInputs(MInstruction *def);
template bool NoFloatPolicy<1>::staticAdjustInputs(MInstruction *def);
template bool NoFloatPolicy<2>::staticAdjustInputs(MInstruction *def);
template bool NoFloatPolicy<3>::staticAdjustInputs(MInstruction *def);
template <unsigned Op>
bool
BoxPolicy<Op>::staticAdjustInputs(MInstruction *ins)
@ -511,18 +423,6 @@ CallPolicy::adjustInputs(MInstruction *ins)
{
MCall *call = ins->toCall();
// External calls shouldn't have Float32 parameters
for (uint32_t i = 0, numArgs = call->numActualArgs(); i < numArgs; i++) {
MDefinition *arg = call->getArg(i+1); // arg 0 is |this|
if (arg->type() == MIRType_Float32) {
JS_ASSERT(arg->isPassArg()); // can't be a type barrier, as Float32 doesn't rely on type inference
MPassArg *passArg = arg->toPassArg();
MInstruction *replace = MToDouble::New(passArg->getArgument());
passArg->replaceOperand(0, replace);
call->block()->insertBefore(passArg, replace);
}
}
MDefinition *func = call->getFunction();
if (func->type() == MIRType_Object)
return true;
@ -576,7 +476,6 @@ StoreTypedArrayPolicy::adjustValueInput(MInstruction *ins, int arrayType,
switch (value->type()) {
case MIRType_Int32:
case MIRType_Double:
case MIRType_Float32:
case MIRType_Boolean:
case MIRType_Value:
break;
@ -606,7 +505,6 @@ StoreTypedArrayPolicy::adjustValueInput(MInstruction *ins, int arrayType,
JS_ASSERT(value->type() == MIRType_Int32 ||
value->type() == MIRType_Boolean ||
value->type() == MIRType_Double ||
value->type() == MIRType_Float32 ||
value->type() == MIRType_Value);
switch (arrayType) {
@ -626,15 +524,6 @@ StoreTypedArrayPolicy::adjustValueInput(MInstruction *ins, int arrayType,
JS_ASSERT(value->type() == MIRType_Int32);
break;
case ScalarTypeRepresentation::TYPE_FLOAT32:
if (LIRGenerator::allowFloat32Optimizations()) {
if (value->type() != MIRType_Float32) {
value = MToFloat32::New(value);
ins->block()->insertBefore(ins, value->toInstruction());
}
break;
}
// Fallthrough: if the LIRGenerator cannot directly store Float32, it will expect the
// stored value to be a double.
case ScalarTypeRepresentation::TYPE_FLOAT64:
if (value->type() != MIRType_Double) {
value = MToDouble::New(value);

42
js/src/jit/TypePolicy.h
View File

@ -35,7 +35,6 @@ class BoxInputsPolicy : public TypePolicy
static MDefinition *boxAt(MInstruction *at, MDefinition *operand);
public:
static MDefinition *alwaysBoxAt(MInstruction *at, MDefinition *operand);
virtual bool adjustInputs(MInstruction *def);
};
@ -139,45 +138,6 @@ class DoublePolicy : public BoxInputsPolicy
}
};
// Expect a float32 for operand Op. If the input is a Value, it is unboxed.
template <unsigned Op>
class Float32Policy : public BoxInputsPolicy
{
public:
static bool staticAdjustInputs(MInstruction *def);
bool adjustInputs(MInstruction *def) {
return staticAdjustInputs(def);
}
};
// Expect a float32 OR a double for operand Op, but will prioritize Float32
// if the result type is set as such. If the input is a Value, it is unboxed.
template <unsigned Op>
class RuntimePolicy : public TypePolicy
{
MIRType policyType_;
public:
bool adjustInputs(MInstruction *def) {
if (policyType_ == MIRType_Double)
return DoublePolicy<Op>::staticAdjustInputs(def);
return Float32Policy<Op>::staticAdjustInputs(def);
}
void setPolicyType(MIRType type) {
policyType_ = type;
}
};
template <unsigned Op>
class NoFloatPolicy
{
public:
static bool staticAdjustInputs(MInstruction *def);
bool adjustInputs(MInstruction *def) {
return staticAdjustInputs(def);
}
};
// Box objects or strings as an input to a ToDouble instruction.
class ToDoublePolicy : public BoxInputsPolicy
{
@ -285,7 +245,7 @@ class ClampPolicy : public BoxInputsPolicy
static inline bool
CoercesToDouble(MIRType type)
{
if (type == MIRType_Undefined || IsFloatingPointType(type))
if (type == MIRType_Undefined || type == MIRType_Double)
return true;
return false;
}

7
js/src/jit/arm/Lowering-arm.h
View File

@ -67,13 +67,6 @@ class LIRGeneratorARM : public LIRGeneratorShared
LGetPropertyCacheT *newLGetPropertyCacheT(MGetPropertyCache *ins);
LGetElementCacheT *newLGetElementCacheT(MGetElementCache *ins);
bool lowerConstantFloat32(float d, MInstruction *ins) {
MOZ_ASSUME_UNREACHABLE("NYI");
}
bool lowerTruncateFToInt32(MTruncateToInt32 *ins) {
MOZ_ASSUME_UNREACHABLE("NYI");
}
public:
bool visitConstant(MConstant *ins);
bool visitBox(MBox *box);

35
js/src/jit/arm/MacroAssembler-arm.h
View File

@ -54,19 +54,6 @@ class MacroAssemblerARM : public Assembler
void convertDoubleToInt32(const FloatRegister &src, const Register &dest, Label *fail,
bool negativeZeroCheck = true);
void convertFloatToDouble(const FloatRegister &src, const FloatRegister &dest) {
MOZ_ASSUME_UNREACHABLE("NYI");
}
void branchTruncateFloat32(const FloatRegister &src, const Register &dest, Label *fail) {
MOZ_ASSUME_UNREACHABLE("NYI");
}
void convertInt32ToFloat32(const Register &src, const FloatRegister &dest) {
MOZ_ASSUME_UNREACHABLE("NYI");
}
void convertInt32ToFloat32(const Address &src, FloatRegister dest) {
MOZ_ASSUME_UNREACHABLE("NYI");
}
void addDouble(FloatRegister src, FloatRegister dest);
void subDouble(FloatRegister src, FloatRegister dest);
void mulDouble(FloatRegister src, FloatRegister dest);
@ -761,16 +748,6 @@ class MacroAssemblerARMCompat : public MacroAssemblerARM
Condition testDoubleTruthy(bool truthy, const FloatRegister &reg);
Condition testStringTruthy(bool truthy, const ValueOperand &value);
void boolValueToFloat32(const ValueOperand &operand, const FloatRegister &dest) {
MOZ_ASSUME_UNREACHABLE("NYI");
}
void int32ValueToFloat32(const ValueOperand &operand, const FloatRegister &dest) {
MOZ_ASSUME_UNREACHABLE("NYI");
}
void loadStaticFloat32(const float *dp, const FloatRegister &dest) {
MOZ_ASSUME_UNREACHABLE("NYI");
}
template<typename T>
void branchTestInt32(Condition cond, const T & t, Label *label) {
Condition c = testInt32(cond, t);
@ -1192,13 +1169,6 @@ class MacroAssemblerARMCompat : public MacroAssemblerARM
void loadFloatAsDouble(const Address &addr, const FloatRegister &dest);
void loadFloatAsDouble(const BaseIndex &src, const FloatRegister &dest);
void loadFloat(const Address &addr, const FloatRegister &dest) {
MOZ_ASSUME_UNREACHABLE("NYI");
}
void loadFloat(const BaseIndex &src, const FloatRegister &dest) {
MOZ_ASSUME_UNREACHABLE("NYI");
}
void store8(const Register &src, const Address &address);
void store8(const Imm32 &imm, const Address &address);
void store8(const Register &src, const BaseIndex &address);
@ -1281,11 +1251,6 @@ class MacroAssemblerARMCompat : public MacroAssemblerARM
void branchDouble(DoubleCondition cond, const FloatRegister &lhs, const FloatRegister &rhs,
Label *label);
void branchFloat(DoubleCondition cond, const FloatRegister &lhs, const FloatRegister &rhs,
Label *label) {
MOZ_ASSUME_UNREACHABLE("NYI");
}
void checkStackAlignment();
void rshiftPtr(Imm32 imm, Register dest) {

115
js/src/jit/shared/Assembler-x86-shared.h
View File

@ -227,10 +227,6 @@ class AssemblerX86Shared
label->bind(masm.size());
masm.doubleConstant(d);
}
void writeFloatConstant(float f, Label *label) {
label->bind(masm.size());
masm.floatConstant(f);
}
void movl(const Imm32 &imm32, const Register &dest) {
masm.movl_i32r(imm32.value, dest.code());
}
@ -336,9 +332,6 @@ class AssemblerX86Shared
void movss(const Operand &src, const FloatRegister &dest) {
JS_ASSERT(HasSSE2());
switch (src.kind()) {
case Operand::FPREG:
masm.movss_rr(src.fpu(), dest.code());
break;
case Operand::REG_DISP:
masm.movss_mr(src.disp(), src.base(), dest.code());
break;
@ -352,9 +345,6 @@ class AssemblerX86Shared
void movss(const FloatRegister &src, const Operand &dest) {
JS_ASSERT(HasSSE2());
switch (dest.kind()) {
case Operand::FPREG:
masm.movss_rr(src.code(), dest.fpu());
break;
case Operand::REG_DISP:
masm.movss_rm(src.code(), dest.disp(), dest.base());
break;
@ -1151,30 +1141,6 @@ class AssemblerX86Shared
JS_ASSERT(HasSSE2());
masm.cvttsd2si_rr(src.code(), dest.code());
}
void cvttss2si(const FloatRegister &src, const Register &dest) {
JS_ASSERT(HasSSE2());
masm.cvttss2si_rr(src.code(), dest.code());
}
void cvtsi2ss(const Operand &src, const FloatRegister &dest) {
JS_ASSERT(HasSSE2());
switch (src.kind()) {
case Operand::REG:
masm.cvtsi2ss_rr(src.reg(), dest.code());
break;
case Operand::REG_DISP:
masm.cvtsi2ss_mr(src.disp(), src.base(), dest.code());
break;
case Operand::SCALE:
masm.cvtsi2ss_mr(src.disp(), src.base(), src.index(), src.scale(), dest.code());
break;
default:
MOZ_ASSUME_UNREACHABLE("unexpected operand kind");
}
}
void cvtsi2ss(const Register &src, const FloatRegister &dest) {
JS_ASSERT(HasSSE2());
masm.cvtsi2ss_rr(src.code(), dest.code());
}
void cvtsi2sd(const Register &src, const FloatRegister &dest) {
JS_ASSERT(HasSSE2());
masm.cvtsi2sd_rr(src.code(), dest.code());
@ -1191,10 +1157,6 @@ class AssemblerX86Shared
JS_ASSERT(HasSSE2());
masm.ucomisd_rr(rhs.code(), lhs.code());
}
void ucomiss(const FloatRegister &lhs, const FloatRegister &rhs) {
JS_ASSERT(HasSSE2());
masm.ucomiss_rr(rhs.code(), lhs.code());
}
void pcmpeqw(const FloatRegister &lhs, const FloatRegister &rhs) {
JS_ASSERT(HasSSE2());
masm.pcmpeqw_rr(rhs.code(), lhs.code());
@ -1211,10 +1173,6 @@ class AssemblerX86Shared
JS_ASSERT(HasSSE2());
masm.addsd_rr(src.code(), dest.code());
}
void addss(const FloatRegister &src, const FloatRegister &dest) {
JS_ASSERT(HasSSE2());
masm.addss_rr(src.code(), dest.code());
}
void addsd(const Operand &src, const FloatRegister &dest) {
JS_ASSERT(HasSSE2());
switch (src.kind()) {
@ -1228,24 +1186,6 @@ class AssemblerX86Shared
case Operand::ADDRESS:
masm.addsd_mr(src.address(), dest.code());
break;
#endif
default:
MOZ_ASSUME_UNREACHABLE("unexpected operand kind");
}
}
void addss(const Operand &src, const FloatRegister &dest) {
JS_ASSERT(HasSSE2());
switch (src.kind()) {
case Operand::FPREG:
masm.addss_rr(src.fpu(), dest.code());
break;
case Operand::REG_DISP:
masm.addss_mr(src.disp(), src.base(), dest.code());
break;
#ifdef JS_CPU_X86
case Operand::ADDRESS:
masm.addss_mr(src.address(), dest.code());
break;
#endif
default:
MOZ_ASSUME_UNREACHABLE("unexpected operand kind");
@ -1255,10 +1195,6 @@ class AssemblerX86Shared
JS_ASSERT(HasSSE2());
masm.subsd_rr(src.code(), dest.code());
}
void subss(const FloatRegister &src, const FloatRegister &dest) {
JS_ASSERT(HasSSE2());
masm.subss_rr(src.code(), dest.code());
}
void subsd(const Operand &src, const FloatRegister &dest) {
JS_ASSERT(HasSSE2());
switch (src.kind()) {
@ -1272,19 +1208,6 @@ class AssemblerX86Shared
MOZ_ASSUME_UNREACHABLE("unexpected operand kind");
}
}
void subss(const Operand &src, const FloatRegister &dest) {
JS_ASSERT(HasSSE2());
switch (src.kind()) {
case Operand::FPREG:
masm.subss_rr(src.fpu(), dest.code());
break;
case Operand::REG_DISP:
masm.subss_mr(src.disp(), src.base(), dest.code());
break;
default:
MOZ_ASSUME_UNREACHABLE("unexpected operand kind");
}
}
void mulsd(const FloatRegister &src, const FloatRegister &dest) {
JS_ASSERT(HasSSE2());
masm.mulsd_rr(src.code(), dest.code());
@ -1302,31 +1225,10 @@ class AssemblerX86Shared
MOZ_ASSUME_UNREACHABLE("unexpected operand kind");
}
}
void mulss(const Operand &src, const FloatRegister &dest) {
JS_ASSERT(HasSSE2());
switch (src.kind()) {
case Operand::FPREG:
masm.mulss_rr(src.fpu(), dest.code());
break;
case Operand::REG_DISP:
masm.mulss_mr(src.disp(), src.base(), dest.code());
break;
default:
MOZ_ASSUME_UNREACHABLE("unexpected operand kind");
}
}
void mulss(const FloatRegister &src, const FloatRegister &dest) {
JS_ASSERT(HasSSE2());
masm.mulss_rr(src.code(), dest.code());
}
void divsd(const FloatRegister &src, const FloatRegister &dest) {
JS_ASSERT(HasSSE2());
masm.divsd_rr(src.code(), dest.code());
}
void divss(const FloatRegister &src, const FloatRegister &dest) {
JS_ASSERT(HasSSE2());
masm.divss_rr(src.code(), dest.code());
}
void divsd(const Operand &src, const FloatRegister &dest) {
JS_ASSERT(HasSSE2());
switch (src.kind()) {
@ -1340,27 +1242,10 @@ class AssemblerX86Shared
MOZ_ASSUME_UNREACHABLE("unexpected operand kind");
}
}
void divss(const Operand &src, const FloatRegister &dest) {
JS_ASSERT(HasSSE2());
switch (src.kind()) {
case Operand::FPREG:
masm.divss_rr(src.fpu(), dest.code());
break;
case Operand::REG_DISP:
masm.divss_mr(src.disp(), src.base(), dest.code());
break;
default:
MOZ_ASSUME_UNREACHABLE("unexpected operand kind");
}
}
void xorpd(const FloatRegister &src, const FloatRegister &dest) {
JS_ASSERT(HasSSE2());
masm.xorpd_rr(src.code(), dest.code());
}
void xorps(const FloatRegister &src, const FloatRegister &dest) {
JS_ASSERT(HasSSE2());
masm.xorps_rr(src.code(), dest.code());
}
void orpd(const FloatRegister &src, const FloatRegister &dest) {
JS_ASSERT(HasSSE2());
masm.orpd_rr(src.code(), dest.code());

16
js/src/jit/shared/CodeGenerator-shared.cpp
View File

@ -162,23 +162,15 @@ CodeGeneratorShared::encodeSlots(LSnapshot *snapshot, MResumePoint *resumePoint,
case MIRType_Object:
case MIRType_Boolean:
case MIRType_Double:
case MIRType_Float32:
{
LAllocation *payload = snapshot->payloadOfSlot(i);
JSValueType valueType = ValueTypeFromMIRType(type);
JSValueType type = ValueTypeFromMIRType(mir->type());
if (payload->isMemory()) {
if (type == MIRType_Float32)
snapshots_.addFloat32Slot(ToStackIndex(payload));
else
snapshots_.addSlot(valueType, ToStackIndex(payload));
snapshots_.addSlot(type, ToStackIndex(payload));
} else if (payload->isGeneralReg()) {
snapshots_.addSlot(valueType, ToRegister(payload));
snapshots_.addSlot(type, ToRegister(payload));
} else if (payload->isFloatReg()) {
FloatRegister reg = ToFloatRegister(payload);
if (type == MIRType_Float32)
snapshots_.addFloat32Slot(reg);
else
snapshots_.addSlot(reg);
snapshots_.addSlot(ToFloatRegister(payload));
} else {
MConstant *constant = mir->toConstant();
const Value &v = constant->value();

46
js/src/jit/shared/CodeGenerator-x86-shared.cpp
View File

@ -89,14 +89,6 @@ CodeGeneratorX86Shared::visitDouble(LDouble *ins)
return true;
}
bool
CodeGeneratorX86Shared::visitFloat32(LFloat32 *ins)
{
const LDefinition *out = ins->getDef(0);
masm.loadConstantFloat32(ins->getFloat(), ToFloatRegister(out));
return true;
}
bool
CodeGeneratorX86Shared::visitTestIAndBranch(LTestIAndBranch *test)
{
@ -1284,34 +1276,6 @@ CodeGeneratorX86Shared::visitMathD(LMathD *math)
return true;
}
bool
CodeGeneratorX86Shared::visitMathF(LMathF *math)
{
FloatRegister lhs = ToFloatRegister(math->lhs());
Operand rhs = ToOperand(math->rhs());
JS_ASSERT(ToFloatRegister(math->output()) == lhs);
switch (math->jsop()) {
case JSOP_ADD:
masm.addss(rhs, lhs);
break;
case JSOP_SUB:
masm.subss(rhs, lhs);
break;
case JSOP_MUL:
masm.mulss(rhs, lhs);
break;
case JSOP_DIV:
masm.divss(rhs, lhs);
break;
default:
MOZ_ASSUME_UNREACHABLE("unexpected opcode");
return false;
}
return true;
}
bool
CodeGeneratorX86Shared::visitFloor(LFloor *lir)
{
@ -1563,16 +1527,6 @@ CodeGeneratorX86Shared::visitNegD(LNegD *ins)
return true;
}
bool
CodeGeneratorX86Shared::visitNegF(LNegF *ins)
{
FloatRegister input = ToFloatRegister(ins->input());
JS_ASSERT(input == ToFloatRegister(ins->output()));
masm.negateFloat(input);
return true;
}
} // namespace jit
} // namespace js

3
js/src/jit/shared/CodeGenerator-x86-shared.h
View File

@ -79,7 +79,6 @@ class CodeGeneratorX86Shared : public CodeGeneratorShared
public:
// Instruction visitors.
virtual bool visitDouble(LDouble *ins);
virtual bool visitFloat32(LFloat32 *ins);
virtual bool visitMinMaxD(LMinMaxD *ins);
virtual bool visitAbsD(LAbsD *ins);
virtual bool visitSqrtD(LSqrtD *ins);
@ -106,7 +105,6 @@ class CodeGeneratorX86Shared : public CodeGeneratorShared
virtual bool visitNotI(LNotI *comp);
virtual bool visitNotD(LNotD *comp);
virtual bool visitMathD(LMathD *math);
virtual bool visitMathF(LMathF *math);
virtual bool visitFloor(LFloor *lir);
virtual bool visitRound(LRound *lir);
virtual bool visitGuardShape(LGuardShape *guard);
@ -118,7 +116,6 @@ class CodeGeneratorX86Shared : public CodeGeneratorShared
bool visitNegI(LNegI *lir);
bool visitNegD(LNegD *lir);
bool visitNegF(LNegF *lir);
// Out of line visitors.
bool visitOutOfLineBailout(OutOfLineBailout *ool);

5
js/src/jit/shared/Lowering-shared-inl.h
View File

@ -140,7 +140,6 @@ LIRGeneratorShared::defineReturn(LInstruction *lir, MDefinition *mir)
lir->setDef(0, LDefinition(vreg, LDefinition::BOX, LGeneralReg(JSReturnReg)));
#endif
break;
case MIRType_Float32:
case MIRType_Double:
lir->setDef(0, LDefinition(vreg, LDefinition::DOUBLE, LFloatReg(ReturnFloatReg)));
break;
@ -275,7 +274,7 @@ LIRGeneratorShared::useRegisterOrNonNegativeConstantAtStart(MDefinition *mir)
LAllocation
LIRGeneratorShared::useRegisterOrNonDoubleConstant(MDefinition *mir)
{
if (mir->isConstant() && mir->type() != MIRType_Double && mir->type() != MIRType_Float32)
if (mir->isConstant() && mir->type() != MIRType_Double)
return LAllocation(mir->toConstant()->vp());
return useRegister(mir);
}
@ -414,7 +413,7 @@ VirtualRegisterOfPayload(MDefinition *mir)
{
if (mir->isBox()) {
MDefinition *inner = mir->toBox()->getOperand(0);
if (!inner->isConstant() && inner->type() != MIRType_Double && inner->type() != MIRType_Float32)
if (!inner->isConstant() && inner->type() != MIRType_Double)
return inner->virtualRegister();
}
if (mir->isTypeBarrier())

5
js/src/jit/shared/Lowering-shared.h
View File

@ -181,11 +181,6 @@ class LIRGeneratorShared : public MInstructionVisitorWithDefaults
static bool allowStaticTypedArrayAccesses() {
return false;
}
// Whether we can emit Float32 specific optimizations.
static bool allowFloat32Optimizations() {
return false;
}
};
} // namespace jit

9
js/src/jit/shared/Lowering-x86-shared.cpp
View File

@ -264,21 +264,12 @@ LIRGeneratorX86Shared::lowerConstantDouble(double d, MInstruction *mir)
return define(new LDouble(d), mir);
}
bool
LIRGeneratorX86Shared::lowerConstantFloat32(float f, MInstruction *mir)
{
return define(new LFloat32(f), mir);
}
bool
LIRGeneratorX86Shared::visitConstant(MConstant *ins)
{
if (ins->type() == MIRType_Double)
return lowerConstantDouble(ins->value().toDouble(), ins);
if (ins->type() == MIRType_Float32)
return lowerConstantFloat32(ins->value().toDouble(), ins);
// Emit non-double constants at their uses.
if (ins->canEmitAtUses())
return emitAtUses(ins);

1
js/src/jit/shared/Lowering-x86-shared.h
View File

@ -46,7 +46,6 @@ class LIRGeneratorX86Shared : public LIRGeneratorShared
bool lowerUMod(MInstruction *mod);
bool lowerUrshD(MUrsh *mir);
bool lowerConstantDouble(double d, MInstruction *ins);
bool lowerConstantFloat32(float d, MInstruction *ins);
bool lowerTruncateDToInt32(MTruncateToInt32 *ins);
};

56
js/src/jit/shared/MacroAssembler-x86-shared.h
View File

@ -62,34 +62,6 @@ class MacroAssemblerX86Shared : public Assembler
j(ConditionFromDoubleCondition(cond), label);
}
void compareFloat(DoubleCondition cond, const FloatRegister &lhs, const FloatRegister &rhs) {
if (cond & DoubleConditionBitInvert)
ucomiss(rhs, lhs);
else
ucomiss(lhs, rhs);
}
void branchFloat(DoubleCondition cond, const FloatRegister &lhs,
const FloatRegister &rhs, Label *label)
{
compareFloat(cond, lhs, rhs);
if (cond == DoubleEqual) {
Label unordered;
j(Parity, &unordered);
j(Equal, label);
bind(&unordered);
return;
}
if (cond == DoubleNotEqualOrUnordered) {
j(NotEqual, label);
j(Parity, label);
return;
}
JS_ASSERT(!(cond & DoubleConditionBitSpecial));
j(ConditionFromDoubleCondition(cond), label);
}
void move32(const Imm32 &imm, const Register &dest) {
if (imm.value == 0)
xorl(dest, dest);
@ -239,12 +211,6 @@ class MacroAssemblerX86Shared : public Assembler
void convertInt32ToDouble(const Address &src, FloatRegister dest) {
cvtsi2sd(Operand(src), dest);
}
void convertInt32ToFloat32(const Register &src, const FloatRegister &dest) {
cvtsi2ss(src, dest);
}
void convertInt32ToFloat32(const Address &src, FloatRegister dest) {
cvtsi2ss(Operand(src), dest);
}
Condition testDoubleTruthy(bool truthy, const FloatRegister &reg) {
xorpd(ScratchFloatReg, ScratchFloatReg);
ucomisd(ScratchFloatReg, reg);
@ -327,13 +293,6 @@ class MacroAssemblerX86Shared : public Assembler
// XOR the float in a float register with -0.0.
xorpd(ScratchFloatReg, reg); // s ^ 0x80000000000000
}
void negateFloat(FloatRegister reg) {
pcmpeqw(ScratchFloatReg, ScratchFloatReg);
psllq(Imm32(31), ScratchFloatReg);
// XOR the float in a float register with -0.0.
xorps(ScratchFloatReg, reg); // s ^ 0x80000000
}
void addDouble(FloatRegister src, FloatRegister dest) {
addsd(src, dest);
}
@ -346,9 +305,6 @@ class MacroAssemblerX86Shared : public Assembler
void divDouble(FloatRegister src, FloatRegister dest) {
divsd(src, dest);
}
void convertFloatToDouble(const FloatRegister &src, const FloatRegister &dest) {
cvtss2sd(src, dest);
}
void convertDoubleToFloat(const FloatRegister &src, const FloatRegister &dest) {
cvtsd2ss(src, dest);
}
@ -368,18 +324,6 @@ class MacroAssemblerX86Shared : public Assembler
movss(src, dest);
cvtss2sd(dest, dest);
}
void loadFloat(const Register &src, FloatRegister dest) {
movss(Operand(src), dest);
}
void loadFloat(const Address &src, FloatRegister dest) {
movss(Operand(src), dest);
}
void loadFloat(const BaseIndex &src, FloatRegister dest) {
movss(Operand(src), dest);
}
void loadFloat(const Operand &src, FloatRegister dest) {
movss(src, dest);
}
void storeFloat(FloatRegister src, const Address &dest) {
movss(src, Operand(dest));
}

16
js/src/jit/x64/Lowering-x64.cpp
View File

@ -104,12 +104,10 @@ LIRGeneratorX64::visitStoreTypedArrayElement(MStoreTypedArrayElement *ins)
JS_ASSERT(ins->elements()->type() == MIRType_Elements);
JS_ASSERT(ins->index()->type() == MIRType_Int32);
if (ins->isFloatArray()) {
JS_ASSERT_IF(ins->arrayType() == ScalarTypeRepresentation::TYPE_FLOAT32, ins->value()->type() == MIRType_Float32);
JS_ASSERT_IF(ins->arrayType() == ScalarTypeRepresentation::TYPE_FLOAT64, ins->value()->type() == MIRType_Double);
} else {
if (ins->isFloatArray())
JS_ASSERT(ins->value()->type() == MIRType_Double);
else
JS_ASSERT(ins->value()->type() == MIRType_Int32);
}
LUse elements = useRegister(ins->elements());
LAllocation index = useRegisterOrConstant(ins->index());
@ -124,12 +122,10 @@ LIRGeneratorX64::visitStoreTypedArrayElementHole(MStoreTypedArrayElementHole *in
JS_ASSERT(ins->index()->type() == MIRType_Int32);
JS_ASSERT(ins->length()->type() == MIRType_Int32);
if (ins->isFloatArray()) {
JS_ASSERT_IF(ins->arrayType() == ScalarTypeRepresentation::TYPE_FLOAT32, ins->value()->type() == MIRType_Float32);
JS_ASSERT_IF(ins->arrayType() == ScalarTypeRepresentation::TYPE_FLOAT64, ins->value()->type() == MIRType_Double);
} else {
if (ins->isFloatArray())
JS_ASSERT(ins->value()->type() == MIRType_Double);
else
JS_ASSERT(ins->value()->type() == MIRType_Int32);
}
LUse elements = useRegister(ins->elements());
LAllocation length = useAnyOrConstant(ins->length());

4
js/src/jit/x64/Lowering-x64.h
View File

@ -44,10 +44,6 @@ class LIRGeneratorX64 : public LIRGeneratorX86Shared
bool visitAsmJSStoreHeap(MAsmJSStoreHeap *ins);
bool visitAsmJSLoadFuncPtr(MAsmJSLoadFuncPtr *ins);
bool visitStoreTypedArrayElementStatic(MStoreTypedArrayElementStatic *ins);
static bool allowFloat32Optimizations() {
return true;
}
};
typedef LIRGeneratorX64 LIRGeneratorSpecific;

19
js/src/jit/x64/MacroAssembler-x64.h
View File

@ -962,29 +962,10 @@ class MacroAssemblerX64 : public MacroAssemblerX86Shared
cvtsi2sd(operand.valueReg(), dest);
}
void boolValueToFloat32(const ValueOperand &operand, const FloatRegister &dest) {
cvtsi2ss(operand.valueReg(), dest);
}
void int32ValueToFloat32(const ValueOperand &operand, const FloatRegister &dest) {
cvtsi2ss(operand.valueReg(), dest);
}
void loadConstantDouble(double d, const FloatRegister &dest);
void loadConstantFloat32(float f, const FloatRegister &dest) {
union FloatPun {
uint32_t u;
float f;
} pun;
pun.f = f;
mov(ImmWord(pun.u), ScratchReg);
movq(ScratchReg, dest);
}
void loadStaticDouble(const double *dp, const FloatRegister &dest) {
loadConstantDouble(*dp, dest);
}
void loadStaticFloat32(const float *fp, const FloatRegister &dest) {
loadConstantFloat32(*fp, dest);
}
void branchTruncateDouble(const FloatRegister &src, const Register &dest, Label *fail) {
const uint64_t IndefiniteIntegerValue = 0x8000000000000000;

1
js/src/jit/x86/Assembler-x86.cpp
View File

@ -25,7 +25,6 @@ ABIArgGenerator::next(MIRType type)
case MIRType_Pointer:
stackOffset_ += sizeof(uint32_t);
break;
case MIRType_Float32: // Float32 moves are actually double moves
case MIRType_Double:
stackOffset_ += sizeof(uint64_t);
break;

16
js/src/jit/x86/Assembler-x86.h
View File

@ -251,7 +251,6 @@ class Assembler : public AssemblerX86Shared
using AssemblerX86Shared::j;
using AssemblerX86Shared::jmp;
using AssemblerX86Shared::movsd;
using AssemblerX86Shared::movss;
using AssemblerX86Shared::retarget;
using AssemblerX86Shared::cmpl;
using AssemblerX86Shared::call;
@ -445,11 +444,6 @@ class Assembler : public AssemblerX86Shared
masm.movsd_mr((const void *)dp, dest.code());
}
void movss(const float *dp, const FloatRegister &dest) {
JS_ASSERT(HasSSE2());
masm.movss_mr((const void *)dp, dest.code());
}
// Move a 32-bit immediate into a register where the immediate can be
// patched.
CodeOffsetLabel movlWithPatch(Imm32 imm, Register dest) {
@ -467,11 +461,6 @@ class Assembler : public AssemblerX86Shared
masm.movsd_mr(addr, dest.code());
return masm.currentOffset();
}
CodeOffsetLabel movssWithPatch(void *addr, FloatRegister dest) {
JS_ASSERT(HasSSE2());
masm.movss_mr(addr, dest.code());
return masm.currentOffset();
}
// Store to *addr where addr can be patched
CodeOffsetLabel movlWithPatch(Register src, void *addr) {
@ -483,11 +472,6 @@ class Assembler : public AssemblerX86Shared
masm.movsd_rm(dest.code(), addr);
return masm.currentOffset();
}
CodeOffsetLabel movssWithPatch(FloatRegister dest, void *addr) {
JS_ASSERT(HasSSE2());
masm.movss_rm(dest.code(), addr);
return masm.currentOffset();
}
// Load from *(base + disp32) where disp32 can be patched.
CodeOffsetLabel movsblWithPatch(Address src, Register dest) {

7
js/src/jit/x86/CodeGenerator-x86.cpp
View File

@ -464,10 +464,10 @@ CodeGeneratorX86::visitLoadTypedArrayElementStatic(LLoadTypedArrayElementStatic
Address srcAddr(ptr, (int32_t) mir->base());
if (vt == ArrayBufferView::TYPE_FLOAT32) {
JS_ASSERT(mir->type() == MIRType_Float32);
FloatRegister dest = ToFloatRegister(out);
masm.movssWithPatch(srcAddr, dest);
masm.canonicalizeFloat(dest);
masm.cvtss2sd(dest, dest);
masm.canonicalizeDouble(dest);
if (ool)
masm.bind(ool->rejoin());
return true;
@ -562,8 +562,7 @@ CodeGeneratorX86::storeViewTypeElement(ArrayBufferView::ViewType vt, const LAllo
const T &dstAddr)
{
if (vt == ArrayBufferView::TYPE_FLOAT32) {
JS_ASSERT(mir->value()->type() == MIRType_Float32);
masm.movssWithPatch(ToFloatRegister(value), dstAddr);
masm.convertDoubleToFloat(ToFloatRegister(value), ScratchFloatReg);
uint32_t before = masm.size();
masm.movssWithPatch(ScratchFloatReg, dstAddr);
uint32_t after = masm.size();

16
js/src/jit/x86/Lowering-x86.cpp
View File

@ -166,12 +166,10 @@ LIRGeneratorX86::visitStoreTypedArrayElement(MStoreTypedArrayElement *ins)
JS_ASSERT(ins->elements()->type() == MIRType_Elements);
JS_ASSERT(ins->index()->type() == MIRType_Int32);
if (ins->isFloatArray()) {
JS_ASSERT_IF(ins->arrayType() == ScalarTypeRepresentation::TYPE_FLOAT64, ins->value()->type() == MIRType_Double);
JS_ASSERT_IF(ins->arrayType() == ScalarTypeRepresentation::TYPE_FLOAT32, ins->value()->type() == MIRType_Float32);
} else {
if (ins->isFloatArray())
JS_ASSERT(ins->value()->type() == MIRType_Double);
else
JS_ASSERT(ins->value()->type() == MIRType_Int32);
}
LUse elements = useRegister(ins->elements());
LAllocation index = useRegisterOrConstant(ins->index());
@ -192,12 +190,10 @@ LIRGeneratorX86::visitStoreTypedArrayElementHole(MStoreTypedArrayElementHole *in
JS_ASSERT(ins->index()->type() == MIRType_Int32);
JS_ASSERT(ins->length()->type() == MIRType_Int32);
if (ins->isFloatArray()) {
JS_ASSERT_IF(ins->arrayType() == ScalarTypeRepresentation::TYPE_FLOAT64, ins->value()->type() == MIRType_Double);
JS_ASSERT_IF(ins->arrayType() == ScalarTypeRepresentation::TYPE_FLOAT32, ins->value()->type() == MIRType_Float32);
} else {
if (ins->isFloatArray())
JS_ASSERT(ins->value()->type() == MIRType_Double);
else
JS_ASSERT(ins->value()->type() == MIRType_Int32);
}
LUse elements = useRegister(ins->elements());
LAllocation length = useAnyOrConstant(ins->length());

4
js/src/jit/x86/Lowering-x86.h
View File

@ -56,10 +56,6 @@ class LIRGeneratorX86 : public LIRGeneratorX86Shared
static bool allowStaticTypedArrayAccesses() {
return true;
}
static bool allowFloat32Optimizations() {
return true;
}
};
typedef LIRGeneratorX86 LIRGeneratorSpecific;

43
js/src/jit/x86/MacroAssembler-x86.cpp
View File

@ -47,34 +47,6 @@ MacroAssemblerX86::loadConstantDouble(double d, const FloatRegister &dest)
dbl.uses.setPrev(masm.size());
}
void
MacroAssemblerX86::loadConstantFloat32(float f, const FloatRegister &dest)
{
// Contrarily to loadConstantDouble, this one doesn't have any maybeInlineFloat,
// but that might be interesting to do it in the future.
if (!floatMap_.initialized()) {
enoughMemory_ &= floatMap_.init();
if (!enoughMemory_)
return;
}
size_t floatIndex;
FloatMap::AddPtr p = floatMap_.lookupForAdd(f);
if (p) {
floatIndex = p->value;
} else {
floatIndex = floats_.length();
enoughMemory_ &= floats_.append(Float(f));
enoughMemory_ &= floatMap_.add(p, f, floatIndex);
if (!enoughMemory_)
return;
}
Float &flt = floats_[floatIndex];
JS_ASSERT(!flt.uses.bound());
masm.movss_mr(reinterpret_cast<const void *>(flt.uses.prev()), dest.code());
flt.uses.setPrev(masm.size());
}
void
MacroAssemblerX86::loadStaticDouble(const double *dp, const FloatRegister &dest) {
if (maybeInlineDouble(*dp, dest))
@ -84,16 +56,10 @@ MacroAssemblerX86::loadStaticDouble(const double *dp, const FloatRegister &dest)
movsd(dp, dest);
}
void
MacroAssemblerX86::loadStaticFloat32(const float *fp, const FloatRegister &dest) {
// x86 can just load from any old immediate address.
movss(fp, dest);
}
void
MacroAssemblerX86::finish()
{
if (doubles_.empty() && floats_.empty())
if (doubles_.empty())
return;
masm.align(sizeof(double));
@ -104,13 +70,6 @@ MacroAssemblerX86::finish()
if (!enoughMemory_)
return;
}
for (size_t i = 0; i < floats_.length(); i++) {
CodeLabel cl(floats_[i].uses);
writeFloatConstant(floats_[i].value, cl.src());
enoughMemory_ &= addCodeLabel(cl);
if (!enoughMemory_)
return;
}
}
void

36
js/src/jit/x86/MacroAssembler-x86.h
View File

@ -33,17 +33,9 @@ class MacroAssemblerX86 : public MacroAssemblerX86Shared
Double(double value) : value(value) {}
};
Vector<Double, 0, SystemAllocPolicy> doubles_;
struct Float {
float value;
AbsoluteLabel uses;
Float(float value) : value(value) {}
};
Vector<Float, 0, SystemAllocPolicy> floats_;
typedef HashMap<double, size_t, DefaultHasher<double>, SystemAllocPolicy> DoubleMap;
DoubleMap doubleMap_;
typedef HashMap<float, size_t, DefaultHasher<float>, SystemAllocPolicy> FloatMap;
FloatMap floatMap_;
protected:
MoveResolver moveResolver_;
@ -810,20 +802,12 @@ class MacroAssemblerX86 : public MacroAssemblerX86Shared
void boolValueToDouble(const ValueOperand &operand, const FloatRegister &dest) {
cvtsi2sd(operand.payloadReg(), dest);
}
void boolValueToFloat32(const ValueOperand &operand, const FloatRegister &dest) {
cvtsi2ss(operand.payloadReg(), dest);
}
void int32ValueToDouble(const ValueOperand &operand, const FloatRegister &dest) {
cvtsi2sd(operand.payloadReg(), dest);
}
void int32ValueToFloat32(const ValueOperand &operand, const FloatRegister &dest) {
cvtsi2ss(operand.payloadReg(), dest);
}
void loadConstantDouble(double d, const FloatRegister &dest);
void loadConstantFloat32(float f, const FloatRegister &dest);
void loadStaticDouble(const double *dp, const FloatRegister &dest);
void loadStaticFloat32(const float *dp, const FloatRegister &dest);
void branchTruncateDouble(const FloatRegister &src, const Register &dest, Label *fail) {
const uint32_t IndefiniteIntegerValue = 0x80000000;
@ -831,12 +815,6 @@ class MacroAssemblerX86 : public MacroAssemblerX86Shared
cmpl(dest, Imm32(IndefiniteIntegerValue));
j(Assembler::Equal, fail);
}
void branchTruncateFloat32(const FloatRegister &src, const Register &dest, Label *fail) {
const uint32_t IndefiniteIntegerValue = 0x80000000;
cvttss2si(src, dest);
cmpl(dest, Imm32(IndefiniteIntegerValue));
j(Assembler::Equal, fail);
}
Condition testInt32Truthy(bool truthy, const ValueOperand &operand) {
testl(operand.payloadReg(), operand.payloadReg());
@ -917,20 +895,6 @@ class MacroAssemblerX86 : public MacroAssemblerX86Shared
addsd(Operand(&NegativeOne), dest);
}
// Note: this function clobbers the source register.
void convertUInt32ToFloat32(const Register &src, const FloatRegister &dest) {
// src is [0, 2^32-1]
subl(Imm32(0x80000000), src);
// Do it the GCC way
cvtsi2ss(src, dest);
// dest is now a double with the int range.
// correct the double value by adding 0x80000000.
static const float NegativeOne = 2147483648.f;
addss(Operand(&NegativeOne), dest);
}
void inc64(AbsoluteAddress dest) {
addl(Imm32(1), Operand(dest));
Label noOverflow;