[pure-lang-svn] SF.net SVN: pure-lang:[753] pure/trunk/interpreter.cc

[<ag...@us...>]

Revision: 753
          http://pure-lang.svn.sourceforge.net/pure-lang/?rev=753&view=rev
Author:   agraef
Date:     2008-09-11 22:06:02 +0000 (Thu, 11 Sep 2008)

Log Message:
-----------
Speedups in pattern-matching code.

Modified Paths:
--------------
    pure/trunk/interpreter.cc

Modified: pure/trunk/interpreter.cc
===================================================================
--- pure/trunk/interpreter.cc	2008-09-11 20:30:06 UTC (rev 752)
+++ pure/trunk/interpreter.cc	2008-09-11 22:06:02 UTC (rev 753)
@@ -5842,11 +5842,11 @@
     msg << "simple match " << f.name;
     debug(msg.str().c_str()); }
 #endif
+  Value *tagv = 0;
+  // check for thunks which must be forced
   if (t.tag != EXPR::VAR || t.ttag != 0) {
-    // check for thunks which must be forced
-#if 1
     // do a quick check on the tag value
-    Value *tagv = f.CreateLoadGEP(x, Zero, Zero, "tag");
+    tagv = f.CreateLoadGEP(x, Zero, Zero, "tag");
     Value *checkv = f.builder.CreateICmpEQ(tagv, Zero, "check");
     BasicBlock *forcebb = BasicBlock::Create("force");
     BasicBlock *skipbb = BasicBlock::Create("skip");
@@ -5857,9 +5857,7 @@
     f.builder.CreateBr(skipbb);
     f.f->getBasicBlockList().push_back(skipbb);
     f.builder.SetInsertPoint(skipbb);
-#else
-    call("pure_force", x);
-#endif
+    tagv = 0;
   }
   // match the current symbol
   switch (t.tag) {
@@ -5868,7 +5866,7 @@
       f.builder.CreateBr(matchedbb);
     else {
       // typed variable, must match type tag against value
-      Value *tagv = f.CreateLoadGEP(x, Zero, Zero, "tag");
+      if (!tagv) tagv = f.CreateLoadGEP(x, Zero, Zero, "tag");
       f.builder.CreateCondBr
 	(f.builder.CreateICmpEQ(tagv, SInt(t.ttag)), matchedbb, failedbb);
     }
@@ -5878,7 +5876,7 @@
   case EXPR::DBL: {
     // first check the tag
     BasicBlock *okbb = BasicBlock::Create("ok");
-    Value *tagv = f.CreateLoadGEP(x, Zero, Zero, "tag");
+    if (!tagv) tagv = f.CreateLoadGEP(x, Zero, Zero, "tag");
     f.builder.CreateCondBr
       (f.builder.CreateICmpEQ(tagv, SInt(t.tag), "cmp"), okbb, failedbb);
     // next check the values (we inline these for max performance)
@@ -5903,7 +5901,7 @@
     // first do a quick check on the tag so that we may avoid an expensive
     // call if the tags don't match
     BasicBlock *okbb = BasicBlock::Create("ok");
-    Value *tagv = f.CreateLoadGEP(x, Zero, Zero, "tag");
+    if (!tagv) tagv = f.CreateLoadGEP(x, Zero, Zero, "tag");
     f.builder.CreateCondBr
       (f.builder.CreateICmpEQ(tagv, SInt(t.tag), "cmp"), okbb, failedbb);
     // next check the values (like above, but we have to call the runtime for
@@ -5927,7 +5925,7 @@
     // first match the tag...
     BasicBlock *ok1bb = BasicBlock::Create("arg1");
     BasicBlock *ok2bb = BasicBlock::Create("arg2");
-    Value *tagv = f.CreateLoadGEP(x, Zero, Zero, "tag");
+    if (!tagv) tagv = f.CreateLoadGEP(x, Zero, Zero, "tag");
     f.builder.CreateCondBr
       (f.builder.CreateICmpEQ(tagv, SInt(t.tag)), ok1bb, failedbb);
     s = t.st;
@@ -5946,7 +5944,7 @@
   default:
     assert(t.tag > 0);
     // just do a quick check on the tag
-    Value *tagv = f.CreateLoadGEP(x, Zero, Zero, "tag");
+    if (!tagv) tagv = f.CreateLoadGEP(x, Zero, Zero, "tag");
     f.builder.CreateCondBr
       (f.builder.CreateICmpEQ(tagv, SInt(t.tag)), matchedbb, failedbb);
     s = t.st;
@@ -6088,11 +6086,11 @@
     t0++; m++;
   }
   must_force = must_force || t0 != s->tr.end();
+  Value *tagv = 0;
+  // check for thunks which must be forced
   if (must_force) {
-    // check for thunks which must be forced
-#if 1
     // do a quick check on the tag value
-    Value *tagv = f.CreateLoadGEP(x, Zero, Zero, "tag");
+    tagv = f.CreateLoadGEP(x, Zero, Zero, "tag");
     Value *checkv = f.builder.CreateICmpEQ(tagv, Zero, "check");
     BasicBlock *forcebb = BasicBlock::Create("force");
     BasicBlock *skipbb = BasicBlock::Create("skip");
@@ -6103,14 +6101,12 @@
     f.builder.CreateBr(skipbb);
     f.f->getBasicBlockList().push_back(skipbb);
     f.builder.SetInsertPoint(skipbb);
-#else
-    call("pure_force", x);
-#endif
+    tagv = 0;
   }
   if (t0 != s->tr.end()) {
     assert(n > m);
     // get the tag value
-    Value *tagv = f.CreateLoadGEP(x, Zero, Zero, "tag");
+    if (!tagv) tagv = f.CreateLoadGEP(x, Zero, Zero, "tag");
     // set up the switch instruction branching over the different tags
     SwitchInst *sw = f.builder.CreateSwitch(tagv, retrybb, n-m);
     /* NOTE: For constant transitions there may be multiple transitions under
@@ -6228,7 +6224,7 @@
   if (t1->tag == EXPR::VAR && t1->ttag == 0) t1++;
   if (t1 != s->tr.end() && t1->tag == EXPR::VAR) {
     // get the tag value
-    Value *tagv = f.CreateLoadGEP(x, Zero, Zero, "tag");
+    if (!tagv) tagv = f.CreateLoadGEP(x, Zero, Zero, "tag");
     // set up the switch instruction branching over the different type tags
     SwitchInst *sw = f.builder.CreateSwitch(tagv, defaultbb);
     vector<BasicBlock*> vtransbb;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.