From 8760794304336ba2db8c59d8314b2519ffebcfff Mon Sep 17 00:00:00 2001 From: bsimmers Date: Thu, 25 Apr 2013 12:32:16 -0700 Subject: [PATCH] hhir punting to interp by default, master version Let's do this. It's already on in the current rc; this is mostly to get another test run on current master. --- hphp/runtime/base/runtime_option.h | 4 ++-- hphp/test/run | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hphp/runtime/base/runtime_option.h b/hphp/runtime/base/runtime_option.h index 3004bb984..dabcccfe5 100644 --- a/hphp/runtime/base/runtime_option.h +++ b/hphp/runtime/base/runtime_option.h @@ -409,7 +409,7 @@ public: F(bool, ThreadingJit, false) \ F(bool, JitTransCounters, false) \ F(bool, JitMGeneric, true) \ - F(bool, JitUseIR, false) \ + F(bool, JitUseIR, true) \ F(double, JitCompareHHIR, 0) \ F(bool, IRPuntDontInterp, false) \ F(bool, HHIRGenericDtorHelper, true) \ @@ -430,7 +430,7 @@ public: F(bool, HHIREnableSinking, true) \ F(bool, HHIRGenerateAsserts, debug) \ F(bool, HHIRDirectExit, true) \ - F(bool, HHIRDisableTx64, false) \ + F(bool, HHIRDisableTx64, true) \ F(uint64_t, MaxHHIRTrans, -1) \ F(bool, HHIRDeadCodeElim, true) \ F(bool, DumpBytecode, false) \ diff --git a/hphp/test/run b/hphp/test/run index 249c50c8e..ffe134092 100755 --- a/hphp/test/run +++ b/hphp/test/run @@ -204,7 +204,7 @@ function mode_arg($options) { switch ($mode) { case '': case 'jit': - return $jit_args; + return "$jit_args -v Eval.JitUseIR=false"; case 'hhir': return "$jit_args -v Eval.JitUseIR=true -v Eval.HHIRDisableTx64=true"; case 'interp':