Changeset 101

Timestamp:

04/23/07 22:53:16 (1 year ago)

Author:

Don Clugston

Message:

Now uses a char [][] array to record type information -- this is much more flexible.

Files:

• trunk/blade/Blade.d (modified) (7 diffs)
• trunk/blade/BladeParse.d (modified) (1 diff)
• trunk/blade/CodegenX87.d (modified) (27 diffs)

trunk/blade/Blade.d

@@ -205 +205 @@
-ReturnType performOperation(ReturnType, char [] operations, char [] finaloperation, int knownlength, X...)(X expr)
-{
- tuplestr = vectorTupleToString!(X
+[] tuplestr = splitTuple(vectorTupleToString!(X)
-  const char [] rettypestr="real";
-  static if (is(RetType: ireal)){ rettypestr="ireal";}
@@ -213 +213 @@
-
-  version(BladeDebug) {
-tuplestr
+vectorTupleToString!(X)
-    static if (knownlength!=0) pragma(msg, "Length is known!");
-    pragma(msg, "Generated Code: "\n ~ generateCode(rettypestr, tuplestr, operations, finaloperation, knownlength));
@@ -220 +220 @@
-}
-
-
+[]
-{
-    char [] a="";
+//    char [][] tuplestr = splitTuple(rawtuplestr);
-  // Decide which code generator to use, based on expression complexity and
-  // assembler availability.
@@ -242 +243 @@
-// of the types in the tuple.
-
-ingle-character s
+
-// Pure imaginary types are treated identically to pure reals, since they result in the
-// same asm code.
@@ -263 +264 @@
-template vectorTupleToString(X...)
-{
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -273 +313 @@
-// Return a string to mixed in, which asserts that all vectors are of
-// equal length.
-
+[]
-{
-    int firstvec = findFirstVector(typelist);
@@ -289 +329 @@
- *
- */
-
+[]
-{
-    char [] iter="";

trunk/blade/BladeParse.d

@@ -22 +22 @@
-
-// Return the first index in the tuple which is of vector type
-
+[]
-{
-    for (int i=0; i< typelist.length;++i) {
-        if (isVector(typelist[i])) return i;
-    }
-    assert(0, typelist);
-}
-
-va
+[] typest
-{
-var=='R' || var=='D' || var=='F' || var
+typestr[0]=='V' || typestr[0]
-}
+
+// Count the number of vectors in the typestring
+int countVectors(char [][] typelist)
+{
+    int numVecs=0;
+    for (int i=0; i<typelist.length; ++i) {
+        if (isVector(typelist[i])) ++numVecs;
+    }
+    return numVecs;
+}
+

trunk/blade/CodegenX87.d

@@ -22 +22 @@
-// Converts an infix string into postfix. Also strips off the # symbols.
-// Apply x87-specific optimisations during the conversion.
-
+[]
-{
-//    if (operations.length==1) return operations;
@@ -31 +31 @@
-    char [] second = operations[x+2..$];
-    if (first[0]=='(') {
-$
+first.length
-    } else if (first[0]=='#') first = operations[1..x+1];
-    if (second[0]=='(') {
-$
+second.length
-    } else if (second[0]=='#') second = operations[x+3..$];
-
@@ -47 +47 @@
-    // complexity of the mini-compiler.).
-    if (operations[x+1]=='+') {
-$-1]=='*' && first[$
+second.length-1]=='*'&& first[first.length
-           return second ~ first ~ operations[x+1..x+2];
-        }
@@ -54 +54 @@
-    // instead of fsub. We use _ to mean reversed subtraction.
-    if (operations[x+1]=='-') {
-$-1]=='*' && first[$
+second.length-1]=='*' && first[first.length
-           return second ~ first ~ "_";
-        }
@@ -61 +61 @@
-    // When an operation is performed between a real[] and a non-real[],
-    // we want to have the real[] being the one which is loaded first.
-'R'
+"VR"
-           return second ~ first ~ "+";
-    }
-'R'
+"VR"
-           return second ~ first ~ "_";
-    }
@@ -77 +77 @@
-{
-    return (op=='+' || op=='*' || op=='-'|| op=='.'|| op=='_');
-}
-
-// Count the number of vectors in the typestring
-int countVectors(char [] typelist)
-{
-    int numVecs=0;
-    for (int i=0; i<typelist.length; ++i) {
-        if (typelist[i]=='R' || typelist[i]=='D' || typelist[i]=='F' || typelist[i]=='Z') ++numVecs;
-    }
-    return numVecs;
-}
-
@@ -115 +105 @@
-}
-
-
+[]
-{
-    int numVecs=0;
-    for (int i=0; i<var-'a'; ++i) {
-'R' || typelist[i]=='D' || typelist[i]=='F' || typelist[i]=='Z'
+"VR" || typelist[i]=="VD" || typelist[i]=="VF"
-    }
-    return numVecs;
-}
-
-
+[]
-{
-    int k=0;
-    for (int i=0; i<var-'a'; ++i) {
-'r'
+"SR"
-    }
-    return k;
@@ -134 +124 @@
-
-
-va
-
-va
-'r'
-'R'
-'d'
-'D'
-'f'
-'F'
+[] typest
+
+typest
+"SR"
+"VR"
+"SD"
+"VD"
+"SF"
+"VF"
-    }
-}
@@ -161 +151 @@
-else static if (real.sizeof==16) const char [] REALSIZE = "16";
-
-vartype
-
-vartype
-'D'
-'F'
-'R'
+[] typestr
+
+typestr
+"VD"
+"VF"
+"VR"
-    }
-}
@@ -175 +165 @@
-
-// Is this expression simple enough for the x87 code generator?
-
+[]
-  version (D_InlineAsm_X86) {
-        // Are there enough index registers?
@@ -182 +172 @@
-        foreach(ch; typelist) {
-            // can only do float, double, and 80-bit vectors, and scalars.
-'R' && ch!='D' && ch!='F' && ch!='r' && ch!='d' && ch!='s'
+"VR" && ch!="VD" && ch!="VF" && ch!="SR" && ch!="SD" && ch!="SF"
-        }
-        // BUG: should also check if it will overflow the FPU stack
@@ -193 +183 @@
-
-// Is this expression simple enough for the SSE2 code generator?
-
+[]
-{
-  version (D_InlineAsm_X86) {
@@ -199 +189 @@
-        foreach(ch; typelist) {
-            // can only do double vectors and double scalars.
-'D' && ch!='d'
+"VD" && ch!="SD"
-        }
-        return false; // not yet implemented
@@ -224 +214 @@
-}
-
-
-
-'R'
+[]
+
+"VR"
-    return operandSize(typelist[var-'a']) ~ "[" ~
-            vectorRegister[vectorNum(typelist, var)] ~ " + " ~ vectorSize(typelist[var-'a']) ~ "*ESI]";
-}
-
-type
-
-
-=='R'
+[] typestr
+
+str
+str=="VR"
-        return "  fstp real ptr [" ~ vectorRegister[vecnum] ~ stride ~ "];"\n;
-    } else {
-) ~ " [" ~ vectorRegister[vecnum] ~ " + " ~ vectorSize(type
+str) ~ " [" ~ vectorRegister[vecnum] ~ " + " ~ vectorSize(typestr
-    }
-}
@@ -248 +238 @@
-        case '+': return "addpd";
-        case '-': return "subpd";
-
+//
-    }
-}
@@ -259 +249 @@
-        case '+': return "addps";
-        case '-': return "subps";
-
-
-
-
-
-
+//
+
+
+
+
+[]
-{
-// Use ESI as the index register.
@@ -312 +302 @@
-
-*/
-
+[]
-{
-    char [] operations = makePostfixForX87(infixOperations, typelist);
@@ -323 +313 @@
-        if (isVector(typelist[i])){
-            result~= "  auto vec" ~ itoa(i) ~ " = expr[" ~itoa(i) ~"].ptr;\n";
-'R'
+"VR"
-                incrementRealVectors ~= "  add " ~ vectorRegister[vecnum] ~ ", " ~ REALSIZE ~ ";\n";
-            }
@@ -333 +323 @@
-    }
-
-$
+operations.length
-    int numScalarsOnStack=0;
-
@@ -347 +337 @@
-    for (int i=0; i<typelist.length; ++i) {
-      if (isVector(typelist[i])) {
-'R'
+"VR"
-              result ~= "  mov " ~ vectorRegister[numvecs] ~ ", vec" ~ itoa(i) ~ ";"\n;
-          } else  {
@@ -355 +345 @@
-         }
-        ++numvecs;
-'r'
+"SR"
-          result ~= "  fld real ptr expr["~ itoa(i) ~"];\n";
-          ++numconsts;
@@ -405 +395 @@
-         // If it's a float or double, we can combine the load+arithmetic op
-         // into a single instruction.
-'R'
+"VR"
-             // 80-bit vectors must be loaded onto the FPU stack first
-            next = "  fld real ptr ["  ~ vectorRegister[vectorNum(typelist, operations[done])] ~ "];\n"
@@ -416 +406 @@
-        done +=2;
-      } else { // multiply by scalar.
-'r'
+"SR"
-             // Multiply by real scalar, which is already on the stack. Note that there's an extra item on the stack when we're in the body of the loop.
-            firstbody ~= "  fmul ST, ST(" ~ itoa(numOnStack + numScalarsOnStack - realScalarNum(typelist, operations[done]-'a')) ~ "); //var" ~ itoa(operations[done]-'a') ~ \n;
@@ -428 +418 @@
-      }
-    }
-
+operations.
-    char [] next;
-$-1]=='R'
+typelist.length-1]=="VR"
-        next = "  fld real ptr ["  ~ vectorRegister[0] ~ "];\n";
-$
-$
+typelist.length
+typelist.length
-    mainbody ~=next; firstbody~=next;
-    ++numOnStack;
@@ -448 +438 @@
-            if (finaloperation[0]=='-') finalop="fsubr";
-            char [] next;
-$-1]=='R'
+typelist.length-1]=="VR"
-                 // 80-bit vectors must be loaded onto the FPU stack first
-                next = "  fld real ptr ["  ~ vectorRegister[numvecs-1] ~ "];"\n;
-                next ~= "  " ~ finalop ~ "p ST(1), ST;\n";
-             } else {
-$
-$
+typelist.length
+typelist.length
-            }
-            mainbody ~=next; firstbody~=next;
@@ -465 +455 @@
-    if (isDotProduct) result ~= "  faddp ST(2), ST;"\n;
-    else {
-$
+typelist.length
-    }
-
@@ -475 +465 @@
-    // Store the result from the final iteration
-    if (isDotProduct) result ~= "  faddp ST(1), ST;"\n;
-$
+typelist.length
-
-    // Discard any scalars that are left on the stack