Reviewers: ulan,

Message:
Committed patchset #1 manually as r20187 (presubmit successful).

Description:
Revert "A64: Now that we have veneers, fix a couple of branches to directly jump
to their target."

This reverts commit r20169, it heavily regresses a Mozilla test:

make -j32 arm64.release.check TESTFLAGS=--time
TESTJOBS=mozilla/js1_5/Regress/regress-280769-2

Before:
--- Total time: 00:01.928 ---
   1 (00:01.911) mozilla/js1_5/Regress/regress-280769-2
   2 (00:01.910) mozilla/js1_5/Regress/regress-280769-2
   3 (00:01.910) mozilla/js1_5/Regress/regress-280769-2

After:
--- Total time: 01:36.025 ---
   1 (01:36.004) mozilla/js1_5/Regress/regress-280769-2
   2 (01:35.403) mozilla/js1_5/Regress/regress-280769-2
   3 (01:32.098) mozilla/js1_5/Regress/regress-280769-2

[email protected]

Committed: https://code.google.com/p/v8/source/detail?r=20187

Please review this at https://codereview.chromium.org/209333004/

SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge

Affected files (+12, -3 lines):
  M src/arm64/regexp-macro-assembler-arm64.cc


Index: src/arm64/regexp-macro-assembler-arm64.cc
diff --git a/src/arm64/regexp-macro-assembler-arm64.cc b/src/arm64/regexp-macro-assembler-arm64.cc index 490facd8f7963700892a0ba9232513ef71f2da8f..536580ab55200599cfa7544478798a8981cd411a 100644
--- a/src/arm64/regexp-macro-assembler-arm64.cc
+++ b/src/arm64/regexp-macro-assembler-arm64.cc
@@ -1481,7 +1481,12 @@ void RegExpMacroAssemblerARM64::BranchOrBacktrack(Condition condition,
   if (to == NULL) {
     to = &backtrack_label_;
   }
-  __ B(condition, to);
+ // TODO(ulan): do direct jump when jump distance is known and fits in imm19.
+  Condition inverted_condition = InvertCondition(condition);
+  Label no_branch;
+  __ B(inverted_condition, &no_branch);
+  __ B(to);
+  __ Bind(&no_branch);
 }

 void RegExpMacroAssemblerARM64::CompareAndBranchOrBacktrack(Register reg,
@@ -1492,11 +1497,15 @@ void RegExpMacroAssemblerARM64::CompareAndBranchOrBacktrack(Register reg,
     if (to == NULL) {
       to = &backtrack_label_;
     }
+ // TODO(ulan): do direct jump when jump distance is known and fits in imm19.
+    Label no_branch;
     if (condition == eq) {
-      __ Cbz(reg, to);
+      __ Cbnz(reg, &no_branch);
     } else {
-      __ Cbnz(reg, to);
+      __ Cbz(reg, &no_branch);
     }
+    __ B(to);
+    __ Bind(&no_branch);
   } else {
     __ Cmp(reg, immediate);
     BranchOrBacktrack(condition, to);


--
--
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.

Reply via email to