Return-Path: Delivered-To: apmail-harmony-commits-archive@www.apache.org Received: (qmail 5959 invoked from network); 2 Feb 2007 13:12:20 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 2 Feb 2007 13:12:20 -0000 Received: (qmail 38580 invoked by uid 500); 2 Feb 2007 13:12:27 -0000 Delivered-To: apmail-harmony-commits-archive@harmony.apache.org Received: (qmail 38483 invoked by uid 500); 2 Feb 2007 13:12:26 -0000 Mailing-List: contact commits-help@harmony.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@harmony.apache.org Delivered-To: mailing list commits@harmony.apache.org Received: (qmail 38474 invoked by uid 99); 2 Feb 2007 13:12:26 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 Feb 2007 05:12:26 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 Feb 2007 05:12:19 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id D4E8A1A981A; Fri, 2 Feb 2007 05:11:59 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r502598 - in /harmony/enhanced/drlvm/trunk/vm/jitrino/src: codegenerator/ia32/Ia32Printer.h optimizer/inliner.cpp optimizer/inliner.h Date: Fri, 02 Feb 2007 13:11:59 -0000 To: commits@harmony.apache.org From: varlax@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070202131159.D4E8A1A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: varlax Date: Fri Feb 2 05:11:58 2007 New Revision: 502598 URL: http://svn.apache.org/viewvc?view=rev&rev=502598 Log: Applied HARMONY-3102 [drlvm][jit] Adding bonus table to Jitrino.OPT inliner Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32Printer.h harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/inliner.cpp harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/inliner.h Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32Printer.h URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32Printer.h?view=diff&rev=502598&r1=502597&r2=502598 ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32Printer.h (original) +++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32Printer.h Fri Feb 2 05:11:58 2007 @@ -52,7 +52,8 @@ Allows to provide an optinal title */ Printer(const IRManager * irm=0, const char * _title=0) - :irManager(irm), title(_title), os(0){} + :irManager(irm), title(_title), os(0) + {if (irManager==NULL) irManager = CompilationContext::getCurrentContext()->getLIRManager();} /** destructs Printer instance */ virtual ~Printer() {} Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/inliner.cpp URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/inliner.cpp?view=diff&rev=502598&r1=502597&r2=502598 ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/inliner.cpp (original) +++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/inliner.cpp Fri Feb 2 05:11:58 2007 @@ -140,6 +140,12 @@ } } + const char* bonusMethods = argSource->getStringArg("bonus_methods", NULL); + _inlineBonusMethodTable = NULL; + if(bonusMethods!=NULL) { + _inlineBonusMethodTable = new (_tmpMM) Method_Table(_tmpMM, bonusMethods, "BONUS_METHODS", false); + } + _usesOptimisticBalancedSync = argSource->getBoolArg("sync_optimistic", false) ? argSource->getBoolArg("sync_optcatch", true) : false; } @@ -153,6 +159,13 @@ << methodDesc.getParentType()->getName() << "." << methodDesc.getName() << ::std::endl; } + if (_inlineBonusMethodTable!=NULL && _inlineBonusMethodTable->accept_this_method(methodDesc)) { + benefit+=1000; + if (Log::isEnabled()) { + Log::out() << "Method is in bonus table benefit+=1000"<