Revision: 23462
Author: [email protected]
Date: Wed Aug 27 14:47:50 2014 UTC
Log: Fix expectations of lowering tests.
[email protected]
BUG=
Review URL: https://codereview.chromium.org/513803002
https://code.google.com/p/v8/source/detail?r=23462
Modified:
/branches/bleeding_edge/src/compiler/simplified-operator-reducer.cc
/branches/bleeding_edge/test/compiler-unittests/change-lowering-unittest.cc
/branches/bleeding_edge/test/compiler-unittests/graph-unittest.cc
/branches/bleeding_edge/test/compiler-unittests/graph-unittest.h
/branches/bleeding_edge/test/compiler-unittests/simplified-operator-reducer-unittest.cc
=======================================
--- /branches/bleeding_edge/src/compiler/simplified-operator-reducer.cc Mon
Aug 25 06:57:13 2014 UTC
+++ /branches/bleeding_edge/src/compiler/simplified-operator-reducer.cc Wed
Aug 27 14:47:50 2014 UTC
@@ -69,7 +69,7 @@
Float64Matcher m(node->InputAt(0));
if (m.HasValue()) return ReplaceInt32(DoubleToInt32(m.Value()));
if (m.IsChangeFloat64ToTagged()) {
- return Change(node, machine()->TruncateFloat64ToInt32(),
+ return Change(node, machine()->ChangeFloat64ToInt32(),
m.node()->InputAt(0));
}
if (m.IsChangeInt32ToTagged()) return Replace(m.node()->InputAt(0));
@@ -79,7 +79,7 @@
Float64Matcher m(node->InputAt(0));
if (m.HasValue()) return ReplaceUint32(DoubleToUint32(m.Value()));
if (m.IsChangeFloat64ToTagged()) {
- return Change(node, machine()->TruncateFloat64ToInt32(),
+ return Change(node, machine()->ChangeFloat64ToUint32(),
m.node()->InputAt(0));
}
if (m.IsChangeUint32ToTagged()) return Replace(m.node()->InputAt(0));
=======================================
---
/branches/bleeding_edge/test/compiler-unittests/change-lowering-unittest.cc
Fri Aug 22 04:47:55 2014 UTC
+++
/branches/bleeding_edge/test/compiler-unittests/change-lowering-unittest.cc
Wed Aug 27 14:47:50 2014 UTC
@@ -269,7 +269,7 @@
Capture<Node*> branch, if_true;
EXPECT_THAT(
phi,
- IsPhi(IsTruncateFloat64ToInt32(IsLoad(
+ IsPhi(IsChangeFloat64ToInt32(IsLoad(
kMachFloat64, val,
IsInt32Constant(HeapNumberValueOffset()),
IsControlEffect(CaptureEq(&if_true)))),
IsWord32Sar(val, IsInt32Constant(SmiShiftAmount())),
@@ -294,7 +294,7 @@
Capture<Node*> branch, if_true;
EXPECT_THAT(
phi,
- IsPhi(IsTruncateFloat64ToInt32(IsLoad(
+ IsPhi(IsChangeFloat64ToUint32(IsLoad(
kMachFloat64, val,
IsInt32Constant(HeapNumberValueOffset()),
IsControlEffect(CaptureEq(&if_true)))),
IsWord32Sar(val, IsInt32Constant(SmiShiftAmount())),
@@ -403,7 +403,7 @@
Capture<Node*> branch, if_true;
EXPECT_THAT(
phi,
- IsPhi(IsTruncateFloat64ToInt32(IsLoad(
+ IsPhi(IsChangeFloat64ToInt32(IsLoad(
kMachFloat64, val,
IsInt32Constant(HeapNumberValueOffset()),
IsControlEffect(CaptureEq(&if_true)))),
IsTruncateInt64ToInt32(
@@ -429,7 +429,7 @@
Capture<Node*> branch, if_true;
EXPECT_THAT(
phi,
- IsPhi(IsTruncateFloat64ToInt32(IsLoad(
+ IsPhi(IsChangeFloat64ToUint32(IsLoad(
kMachFloat64, val,
IsInt32Constant(HeapNumberValueOffset()),
IsControlEffect(CaptureEq(&if_true)))),
IsTruncateInt64ToInt32(
=======================================
--- /branches/bleeding_edge/test/compiler-unittests/graph-unittest.cc Fri
Aug 22 07:54:09 2014 UTC
+++ /branches/bleeding_edge/test/compiler-unittests/graph-unittest.cc Wed
Aug 27 14:47:50 2014 UTC
@@ -744,6 +744,7 @@
return MakeMatcher(new IsUnopMatcher(IrOpcode::k##Name,
input_matcher)); \
}
IS_UNOP_MATCHER(ChangeFloat64ToInt32)
+IS_UNOP_MATCHER(ChangeFloat64ToUint32)
IS_UNOP_MATCHER(ChangeInt32ToFloat64)
IS_UNOP_MATCHER(ChangeInt32ToInt64)
IS_UNOP_MATCHER(ChangeUint32ToFloat64)
=======================================
--- /branches/bleeding_edge/test/compiler-unittests/graph-unittest.h Fri
Aug 22 07:54:09 2014 UTC
+++ /branches/bleeding_edge/test/compiler-unittests/graph-unittest.h Wed
Aug 27 14:47:50 2014 UTC
@@ -113,6 +113,7 @@
Matcher<Node*> IsUint32LessThanOrEqual(const Matcher<Node*>& lhs_matcher,
const Matcher<Node*>& rhs_matcher);
Matcher<Node*> IsChangeFloat64ToInt32(const Matcher<Node*>& input_matcher);
+Matcher<Node*> IsChangeFloat64ToUint32(const Matcher<Node*>&
input_matcher);
Matcher<Node*> IsChangeInt32ToFloat64(const Matcher<Node*>& input_matcher);
Matcher<Node*> IsChangeInt32ToInt64(const Matcher<Node*>& input_matcher);
Matcher<Node*> IsChangeUint32ToFloat64(const Matcher<Node*>&
input_matcher);
=======================================
---
/branches/bleeding_edge/test/compiler-unittests/simplified-operator-reducer-unittest.cc
Fri Aug 22 04:47:55 2014 UTC
+++
/branches/bleeding_edge/test/compiler-unittests/simplified-operator-reducer-unittest.cc
Wed Aug 27 14:47:50 2014 UTC
@@ -364,7 +364,7 @@
simplified()->ChangeTaggedToInt32(),
graph()->NewNode(simplified()->ChangeFloat64ToTagged(), param0)));
ASSERT_TRUE(reduction.Changed());
- EXPECT_THAT(reduction.replacement(), IsTruncateFloat64ToInt32(param0));
+ EXPECT_THAT(reduction.replacement(), IsChangeFloat64ToInt32(param0));
}
@@ -418,7 +418,7 @@
simplified()->ChangeTaggedToUint32(),
graph()->NewNode(simplified()->ChangeFloat64ToTagged(), param0)));
ASSERT_TRUE(reduction.Changed());
- EXPECT_THAT(reduction.replacement(), IsTruncateFloat64ToInt32(param0));
+ EXPECT_THAT(reduction.replacement(), IsChangeFloat64ToUint32(param0));
}
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
