Changeset 153

Timestamp:

12/01/07 03:36:16 (10 months ago)

Author:

Don Clugston

Message:

Refactoring for strided vectors.

Files:

• trunk/blade/Blade.d (modified) (10 diffs)
• trunk/blade/BladeDemo.d (modified) (2 diffs)
• trunk/blade/BladeRank.d (modified) (1 diff)
• trunk/blade/BladeSimplify.d (modified) (2 diffs)

trunk/blade/Blade.d

@@ -47 +47 @@
-public import blade.SyntaxTree : AbstractSyntaxTree, syntaxtreeof, AST, Symbol;
-private import blade.BladeUtil : enquote;
-
+
+
-public import blade.CodegenX86 : generateCodeForAsmX87, MAX_X87_VECTORS,
-                                 generateCodeForSSE,  MAX_SSE_VECTORS;
@@ -280 +281 @@
-//                }
-                result ~= "assert(" 
-
-
-
+
+
+
+
+
-            }
-        }
@@ -294 +297 @@
-    for (int i=0; i<revised.mapping.length;++i) {
-        if (revised.rank[i]=='1'){
-
-.ptr
+&
+[0]
-        }
-    }
@@ -310 +313 @@
-
-// Return a vector which contains the length of the expression.
-
+
+
+
-int findVectorForLength(AbstractSyntaxTree tree, RevisedExpression revised)
-{
@@ -331 +336 @@
-        }
-    }
-
-
+
+
+
+
+
+
-}
-
@@ -343 +352 @@
-    if (c-'A'<tree.symbolTable.length) {
-        v = tree.symbolTable[c-'A'].value;
-
-
-
+
+
+
+
-        // indexed array, possibly involving slicing
-        int numbrack=0;
@@ -352 +362 @@
-        // Replace the last slice [a..b] operation with [a+firstIndexExpr]
-        // or if no slices exist, append [firstIndexExpr] to the end.
-        int endk = revised.compounds[c-'A'-tree.symbolTable.length].length;
-        int numbracks = 0;
-        bool isSlice=false;
-        char [] newSlice;
-
-revised.compounds[c-'A'-tree.symbolTable.length]
-revised.compounds[c-'A'-tree.symbolTable.length]
+comp
+comp
-            if (d == ']') {  ++numbracks; }
-            if (d == '[') { --numbracks; }
-           
-endk = k;
+
-            else if (d=='.' && numbracks==1) { isSlice=true; 
-endk=k;
+
-                else newSlice = "." ~ newSlice;
-            }
-            else if (d=='[' && numbracks==0) {
-                if (isSlice && numSlicesRemaining>0) {
- //revised.compounds[c-'A'-tree.symbolTable.length][k+1..endk]
+
-                    ~ "+" ~ firstIndexExpr ~ "]" ~ v;
-                    --numSlicesRemaining;
-                } else {
- //revised.compounds[c-'A'-tree.symbolTable.length][k+1..endk] ~ "]";
+
-                }
-                newSlice="";
@@ -379 +388 @@
-            } else if (d==',' && numbracks==1) {
-                if (isSlice && numSlicesRemaining>0) {
- //revised.compounds[c-'A'-tree.symbolTable.length][k+1..endk]
+
-                    ~ "+" ~ firstIndexExpr ~ "]" ~ v;
-                    --numSlicesRemaining;
@@ -395 +404 @@
-            v~="[" ~ firstIndexExpr ~ "]";
-        }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-            if (d>='A' && d<='Z') v ~= tree.symbolTable[d-'A'].value;
-            else v ~= d;
-        }
-    }
+    }
-    for (; numSlicesRemaining>0; --numSlicesRemaining) {
-        v~="[" ~ firstIndexExpr ~ "]";
@@ -428 +418 @@
-}
-
+// Convert the compound expression str back into its values.
+char [] getValueForCompoundExpression(char [] str, Symbol[] table)
+{
+    char [] v="";
+    foreach(d; str) {
+        if (d>='A' && d<='Z') v ~= table[d-'A'].value;
+        else v ~= d;
+    }
+    return v;
+}
+
-
-// Generate inline D code for the expression
-char [] DCodeGenerator(AbstractSyntaxTree tree, RevisedExpression revised)
-{
-//        assert(!strided, tree.expression ~ "Strided vectors are not yet supported");
-
-    int lenvec = findVectorForLength(tree, revised);
-    char [] result = "for (int blade_index=0; blade_index<" 
-
-
-
+
+
-    foreach (c; revised.expression) {
-        if (c>='A' && c<'Z') {
-            // restore all symbols into the expression
-  //          result ~= getValueForSymbol(c, tree, revised);
-            // If it's a vector, index it
-            if (revised.rank[c-'A']=='1')

trunk/blade/BladeDemo.d

@@ -35 +35 @@
-
-    mixin(vectorize(` a += (d[2..$-1]*2.01*a[2]-another[][1])["abc".length-3..$]`));
-
+/+
-    mixin(vectorize(" a-= 2.01*(        3.04+k)*r"));
-    mixin(vectorize("q+= q*2.01"));
@@ -43 +43 @@
-    mixin(vectorize("a+=6*another[1]"));
-    mixin(vectorize("a+=6*another[1][]"));
-
++/
-    mixin(vectorize("a[0..2]+=6*another[0..$,1]"));
-  

trunk/blade/BladeRank.d

@@ -324 +324 @@
-    assert(!hasScalarMultiply("(C[B])[B..A]","002") );
-}
+
+public:
+// return true if the given symbol has a non-zero stride.
+// This happens whenever there is a slice (including a complete slice)
+// where there is a later incomplete slice or index.
+//
+bool isStrided(char [] s)
+{
+   assert(s[$-1]==']', "BLADE ICE");
+   if (s[$-2..$]=="[]") return false;
+   int numbrack=0;
+   int paren = 0;
+   bool hasSliced=false;
+   bool maybeSlice = false;
+   bool startIndex=false;
+   for(int i=1; i<s.length; ++i) {
+        if (s[i]=='(') ++paren;
+        else if (s[i]==')') --paren;
+        if (paren==0 && s[i]==']') {
+            if (startIndex && hasSliced) return true;   
+            numbrack--;
+            if (s[i-1]=='[') { startIndex=false; } 
+        }
+        if (paren==0 && s[i]=='[') {
+            startIndex = true;
+            maybeSlice = false;
+            numbrack++;
+        }
+        if (paren==0 && numbrack==1 && s[i]==',') {           
+            if (hasSliced && startIndex) return true;
+            if (maybeSlice) hasSliced = true;
+            startIndex = true;
+        }
+        if (paren==0 && numbrack==2 && s[i]==',') { startIndex=false; hasSliced=true; }
+        if (paren==0 && numbrack==1 && s[i]=='.' && s[i-1]=='.') {
+             startIndex = false; // [..] slices don't move the index to the next value.
+             maybeSlice = true;
+        }
+   }
+   return false;
+}
+
+private:
+unittest {
+    assert(!isStrided("A[3..5][]"));
+    assert(!isStrided("A[2..7][3]"));
+    assert(!isStrided("A[][2]"));
+    assert(!isStrided("A[2,[2,7]]"));
+    assert(isStrided("A[[2,7],3]"));
+    assert(isStrided("C[D..$,D]"));
+    assert(!isStrided("A[7][B[[1,3],2]..6]"));
+}

trunk/blade/BladeSimplify.d

@@ -29 +29 @@
-
-public import blade.SyntaxTree : AbstractSyntaxTree, Symbol;
-
+
+
-
-
@@ -248 +249 @@
-   return r;
-}
-
-public:
-// return true if the given symbol has a non-zero stride.
-// This happens whenever there is a slice (including a complete slice)
-// where there is a later incomplete slice or index.
-//
-bool isStrided(char [] s)
-{
-   assert(s[$-1]==']', "BLADE ICE");
-   if (s[$-2..$]=="[]") return false;
-   int numbrack=0;
-   int paren = 0;
-   bool hasSliced=false;
-   bool maybeSlice = false;
-   bool startIndex=false;
-   for(int i=1; i<s.length; ++i) {
-        if (s[i]=='(') ++paren;
-        else if (s[i]==')') --paren;
-        if (paren==0 && s[i]==']') {
-            if (startIndex && hasSliced) return true;   
-            numbrack--;
-            if (s[i-1]=='[') { startIndex=false; } 
-        }
-        if (paren==0 && s[i]=='[') {
-            startIndex = true;
-            maybeSlice = false;
-            numbrack++;
-        }
-        if (paren==0 && numbrack==1 && s[i]==',') {           
-            if (hasSliced && startIndex) return true;
-            if (maybeSlice) hasSliced = true;
-            startIndex = true;
-        }
-        if (paren==0 && numbrack==2 && s[i]==',') { startIndex=false; hasSliced=true; }
-        if (paren==0 && numbrack==1 && s[i]=='.' && s[i-1]=='.') {
-             startIndex = false; // [..] slices don't move the index to the next value.
-             maybeSlice = true;
-        }
-   }
-   return false;
-}
-
-private:
-unittest {
-    assert(!isStrided("A[3..5][]"));
-    assert(!isStrided("A[2..7][3]"));
-    assert(!isStrided("A[][2]"));
-    assert(!isStrided("A[2,[2,7]]"));
-    assert(isStrided("A[[2,7],3]"));
-    assert(isStrided("C[D..$,D]"));
-    assert(!isStrided("A[7][B[[1,3],2]..6]"));
-}
-
-
-RevisedExpression simplifyVectorExpression(char [] expr, char [] rank)