Merge pull request #12 from XYenChi/fix-prefix

Add __riscv_ prefix for new intrinsic.

.gitignore

@@ -4,3 +4,4 @@ build/
 include/autogen
 include/AutoGenComputeOp.h
 *.pyc
+test/

include/TypeInfo.hpp

@@ -122,9 +122,9 @@ struct TypeInfo {
                             sew.to_string()),
         shortVectorTypeName((std::string(TYPE_CLASS_SHORT_STR(typeClass)) +
                              sew.to_string() + std::string(LMUL_STR(lmul)))),
-        setvlTypeName("vsetvl_e" + sew.to_string() +
+        setvlTypeName("__riscv_vsetvl_e" + sew.to_string() +
                       std::string(LMUL_STR(lmul))),
-        setvlmaxTypeName("vsetvlmax_e" + sew.to_string() +
+        setvlmaxTypeName("__riscv_vsetvlmax_e" + sew.to_string() +
                          std::string(LMUL_STR(lmul))) {}
 };
 

library/Basic.cpp

@@ -1,6 +1,11 @@
 // Basic.cpp
 /*
 Implementations.
+
+The MACRO `CUSTOM_OP_TYPE` declared under `include/CustomOperator.def'
+will be fed into this file for enum definition,
+include/Operator.hpp for derived class definition
+library/Operator.cpp for derived class member function implementation.
 */
 #include "Basic.hpp"
 

library/Graph.cpp

@@ -25,13 +25,24 @@ struct OpDefinition {
   CustomValType outputType;
   int numOfInputs;
   std::vector<CustomValType> inputTypes;
-  OpDefinition(CustomValType opType, std::string &&opTypeStr,
-               std::string &&opId, int sew, TypeClass typeClass,
-               uint32_t opAttr, CustomValType outputType, int numOfInputs,
+  OpDefinition(CustomValType opType, 
+               std::string &&opTypeStr,
+               std::string &&opId, 
+               int sew, 
+               TypeClass typeClass,
+               uint32_t opAttr, 
+               CustomValType outputType, 
+               int numOfInputs,
                std::vector<CustomValType> inputTypes)
-      : opType(opType), opTypeStr(std::move(opTypeStr)), opId(std::move(opId)),
-        sew(sew), typeClass(typeClass), opAttr(opAttr), outputType(outputType),
-        numOfInputs(numOfInputs), inputTypes(inputTypes) {}
+      : opType(opType), 
+        opTypeStr(std::move(opTypeStr)), 
+        opId(std::move(opId)),
+        sew(sew), 
+        typeClass(typeClass), 
+        opAttr(opAttr), 
+        outputType(outputType),
+        numOfInputs(numOfInputs), 
+        inputTypes(inputTypes) {}
 };
 
 bool Graph::isConstructedUseDefineCandidate = false;
@@ -214,6 +225,7 @@ Graph::getOperatorsInReverseTopologicalOrder(uint32_t seed) {
 }
 
 void Graph::emitHeader(std::ostream &os) {
+  os << "// generated by library/Graph.cpp Graph::emitHeader\n";
   os << "#include <stdbool.h>\n";
   os << "#include <stdint.h>\n";
   os << "#include <stdlib.h>\n";
@@ -258,16 +270,19 @@ void Graph::generateCCode(std::ostream &os, uint32_t seed) {
 
   // declare values in global (avoid stack overflow)
   for (auto value : values)
-    value->generateCCode(os);
+    {
+      value->generateCCode(os);
+    }
+
 
   // generate function calls for the operators
   for (auto id : ordering) {
     auto op = operatorLUT[id];
 
     if (op->type != Initialize)
       initializeLmul(op);
-
     os << "void " << op->getNameWithType() << "() {\n";
+    os << "// getNameWithType \n";
     op->generateCCode(os);
     os << "}\n";
   }
@@ -280,7 +295,6 @@ void Graph::generateCCode(std::ostream &os, uint32_t seed) {
     // values that are non-intermediate results.
     if (VerificationMode == "short" && op->outputs[0]->outputs.size() != 0)
       continue;
-
     os << "int golden_" << op->getNameWithType() << "() {\n";
 
     generateVerificationCode(os, op);
@@ -309,9 +323,11 @@ void Graph::generateCCode(std::ostream &os, uint32_t seed) {
   }
 
   // return 1 if any there is any failure in the operator
+  os << "// generated by library/Graph.cpp Graph::generateCCode";
   os << "int ret = 1; // 1 = success\n";
   for (auto id : ordering) {
     auto op = operatorLUT[id];
+    os << "// operatorLUT[id] = " << operatorLUT[id] << "\n";
     os << "ret &= golden_" << op->getNameWithType() << "();\n";
   }
   os << "if (!ret) return 1;\n";