Merge branch 'master' into doe

1 files changed, 190 insertions, 0 deletions

diff --git a/omega/examples/old_test/lift2.oc-rt b/omega/examples/old_test/lift2.oc-rt
new file mode 100644
index 0000000..41e1fa8
--- /dev/null
+++ b/omega/examples/old_test/lift2.oc-rt
@@ -0,0 +1,190 @@
+>>> I1 := { [i,j,k,l,m] : 5 <= i <= 60 && 1 <= j,k,l,m <= 100 };
+>>> I2 := { [i,j,k,l,m] : 1 <= i,j,k,l,m <= 100 };
+>>> 
+>>> codegen 0 I1,I2;
+for(t1 = 1; t1 <= 100; t1++) {
+  for(t2 = 1; t2 <= 100; t2++) {
+    for(t3 = 1; t3 <= 100; t3++) {
+      for(t4 = 1; t4 <= 100; t4++) {
+        for(t5 = 1; t5 <= 100; t5++) {
+          s2(t1,t2,t3,t4,t5);
+          if (t1 >= 5 && t1 <= 60) {
+            s1(t1,t2,t3,t4,t5);
+          }
+        }
+      }
+    }
+  }
+}
+
+>>> 
+>>> #default
+>>> codegen 1 I1,I2;
+for(t1 = 1; t1 <= 100; t1++) {
+  for(t2 = 1; t2 <= 100; t2++) {
+    for(t3 = 1; t3 <= 100; t3++) {
+      for(t4 = 1; t4 <= 100; t4++) {
+        if (t1 <= 4) {
+          for(t5 = 1; t5 <= 100; t5++) {
+            s2(t1,t2,t3,t4,t5);
+          }
+        }
+        if (t1 >= 5 && t1 <= 60) {
+          for(t5 = 1; t5 <= 100; t5++) {
+            s1(t1,t2,t3,t4,t5);
+            s2(t1,t2,t3,t4,t5);
+          }
+        }
+        if (t1 >= 61) {
+          for(t5 = 1; t5 <= 100; t5++) {
+            s2(t1,t2,t3,t4,t5);
+          }
+        }
+      }
+    }
+  }
+}
+
+>>> 
+>>> codegen 2 I1,I2;
+for(t1 = 1; t1 <= 100; t1++) {
+  for(t2 = 1; t2 <= 100; t2++) {
+    for(t3 = 1; t3 <= 100; t3++) {
+      if (t1 <= 4) {
+        for(t4 = 1; t4 <= 100; t4++) {
+          for(t5 = 1; t5 <= 100; t5++) {
+            s2(t1,t2,t3,t4,t5);
+          }
+        }
+      }
+      if (t1 >= 5 && t1 <= 60) {
+        for(t4 = 1; t4 <= 100; t4++) {
+          for(t5 = 1; t5 <= 100; t5++) {
+            s1(t1,t2,t3,t4,t5);
+            s2(t1,t2,t3,t4,t5);
+          }
+        }
+      }
+      if (t1 >= 61) {
+        for(t4 = 1; t4 <= 100; t4++) {
+          for(t5 = 1; t5 <= 100; t5++) {
+            s2(t1,t2,t3,t4,t5);
+          }
+        }
+      }
+    }
+  }
+}
+
+>>> 
+>>> codegen 3 I1,I2;
+for(t1 = 1; t1 <= 100; t1++) {
+  for(t2 = 1; t2 <= 100; t2++) {
+    if (t1 <= 4) {
+      for(t3 = 1; t3 <= 100; t3++) {
+        for(t4 = 1; t4 <= 100; t4++) {
+          for(t5 = 1; t5 <= 100; t5++) {
+            s2(t1,t2,t3,t4,t5);
+          }
+        }
+      }
+    }
+    if (t1 >= 5 && t1 <= 60) {
+      for(t3 = 1; t3 <= 100; t3++) {
+        for(t4 = 1; t4 <= 100; t4++) {
+          for(t5 = 1; t5 <= 100; t5++) {
+            s1(t1,t2,t3,t4,t5);
+            s2(t1,t2,t3,t4,t5);
+          }
+        }
+      }
+    }
+    if (t1 >= 61) {
+      for(t3 = 1; t3 <= 100; t3++) {
+        for(t4 = 1; t4 <= 100; t4++) {
+          for(t5 = 1; t5 <= 100; t5++) {
+            s2(t1,t2,t3,t4,t5);
+          }
+        }
+      }
+    }
+  }
+}
+
+>>> 
+>>> codegen 4 I1,I2;
+for(t1 = 1; t1 <= 100; t1++) {
+  if (t1 <= 4) {
+    for(t2 = 1; t2 <= 100; t2++) {
+      for(t3 = 1; t3 <= 100; t3++) {
+        for(t4 = 1; t4 <= 100; t4++) {
+          for(t5 = 1; t5 <= 100; t5++) {
+            s2(t1,t2,t3,t4,t5);
+          }
+        }
+      }
+    }
+  }
+  if (t1 >= 5 && t1 <= 60) {
+    for(t2 = 1; t2 <= 100; t2++) {
+      for(t3 = 1; t3 <= 100; t3++) {
+        for(t4 = 1; t4 <= 100; t4++) {
+          for(t5 = 1; t5 <= 100; t5++) {
+            s1(t1,t2,t3,t4,t5);
+            s2(t1,t2,t3,t4,t5);
+          }
+        }
+      }
+    }
+  }
+  if (t1 >= 61) {
+    for(t2 = 1; t2 <= 100; t2++) {
+      for(t3 = 1; t3 <= 100; t3++) {
+        for(t4 = 1; t4 <= 100; t4++) {
+          for(t5 = 1; t5 <= 100; t5++) {
+            s2(t1,t2,t3,t4,t5);
+          }
+        }
+      }
+    }
+  }
+}
+
+>>> 
+>>> codegen 5 I1,I2;
+for(t1 = 1; t1 <= 4; t1++) {
+  for(t2 = 1; t2 <= 100; t2++) {
+    for(t3 = 1; t3 <= 100; t3++) {
+      for(t4 = 1; t4 <= 100; t4++) {
+        for(t5 = 1; t5 <= 100; t5++) {
+          s2(t1,t2,t3,t4,t5);
+        }
+      }
+    }
+  }
+}
+for(t1 = 5; t1 <= 60; t1++) {
+  for(t2 = 1; t2 <= 100; t2++) {
+    for(t3 = 1; t3 <= 100; t3++) {
+      for(t4 = 1; t4 <= 100; t4++) {
+        for(t5 = 1; t5 <= 100; t5++) {
+          s1(t1,t2,t3,t4,t5);
+          s2(t1,t2,t3,t4,t5);
+        }
+      }
+    }
+  }
+}
+for(t1 = 61; t1 <= 100; t1++) {
+  for(t2 = 1; t2 <= 100; t2++) {
+    for(t3 = 1; t3 <= 100; t3++) {
+      for(t4 = 1; t4 <= 100; t4++) {
+        for(t5 = 1; t5 <= 100; t5++) {
+          s2(t1,t2,t3,t4,t5);
+        }
+      }
+    }
+  }
+}
+
+