Changeset 3996 for trunk/lib_ir

Timestamp:

Aug 12, 2014, 1:54:54 PM (5 years ago)

Author:

linmengl

Message:

extend template system for i4 and i8.

Location:

trunk/lib_ir/gen

Files:

• gen.py (modified) (5 diffs)
• llc_func.pytemplate.ll (modified) (2 diffs)
• test_llc.pytemplate.cpp (modified) (5 diffs)

trunk/lib_ir/gen/gen.py

@@ -13 +13 @@
 
 FunctionList = ["add", "sub", "mult", "eq", "lt", "gt", "ult", "ugt", "vsll", "vsrl", "vsra"]
+FunctionListI4 = ["add", "sub"]
+FunctionListI8 = ["add", "sub", "mult", "eq", "lt", "gt", "ult", "ugt", "vsll", "vsrl", "vsra"]
+
+FW = 2
 
 def C(name):
-    return name + "_2"
+    return "{name}_{fw}".format(name=name, fw=FW)
 
 def CXX(name):
     if name in ["vsll", "vsrl", "vsra"]:
-        return "simd<2>::" + name[1:] + "i"
-    return "simd<2>::" + name
+        return "simd<{fw}>::{name}i".format(fw=FW, name=name[1:])
+    return "simd<{fw}>::{name}".format(fw=FW, name=name)
 
 def OP(name):
@@ -41 +45 @@
     return ""
 
-FunctionNames = [{"c": C(name), "cxx": CXX(name), "op": OP(name), "flag": FLAG(name)}
-                    for name in FunctionList]
+#Get all v64i2 names
+FunctionNames = [{"c": C(name), "cxx": CXX(name), "op": OP(name),
+                  "flag": FLAG(name), "fw": FW} for name in FunctionList]
+FW = 4
+FunctionNamesI4 = [{"c": C(name), "cxx": CXX(name), "op": OP(name),
+                    "flag": FLAG(name), "fw": FW} for name in FunctionListI4]
+FW = 8
+FunctionNamesI8 = [{"c": C(name), "cxx": CXX(name), "op": OP(name),
+                    "flag": FLAG(name), "fw": FW} for name in FunctionListI8]
 
 #configuring Jinja2
@@ -57 +68 @@
     fillTemplate(template=TestTemplate, output=TestOutput,
                  params=dict(HeaderComment = "AUTO GENERATED FILE",
-                             FunctionNames = FunctionNames))
+                             FunctionNames = FunctionNames,
+                             FunctionNamesI4 = FunctionNamesI4,
+                             FunctionNamesI8 = FunctionNamesI8,
+                             ))
 
 def genLLFile():
     fillTemplate(template=LLTemplate, output=LLOutput,
-                 params=dict(FunctionNames = FunctionNames))
+                 params=dict(FunctionNames = FunctionNames,
+                             FunctionNamesI4 = FunctionNamesI4,
+                             FunctionNamesI8 = FunctionNamesI8,
+                             ))
 
 def genFuncFile():
@@ -68 +85 @@
                              FunctionNames = FunctionNames,
                              Implement = impl_data.getImplements()))
+    # NEED to copy manually.
     # mv ParabixGeneratedFuncs.h ~/llvm_suit/llvm_git/lib/Target/X86/
 
@@ -73 +91 @@
     genTestFile()
     genLLFile()
-    genFuncFile()
+    #genFuncFile()
 

trunk/lib_ir/gen/llc_func.pytemplate.ll

@@ -12 +12 @@
 {% endfor %}
 
+{% for i in [0, 1, 17] %}
 {% for x in range(0, 4) %}
-define <64 x i2> @insertelement_idx0_elt{{ x }}(<64 x i2> %a) {
+define <64 x i2> @insertelement_idx{{ i }}_elt{{ x }}(<64 x i2> %a) {
 entry:
-  %c = insertelement <64 x i2> %a, i2 {{ x }}, i32 0
+  %c = insertelement <64 x i2> %a, i2 {{ x }}, i32 {{ i }}
   ret <64 x i2> %c
 }
 
-define <64 x i2> @insertelement_idx1_elt{{ x }}(<64 x i2> %a) {
-entry:
-  %c = insertelement <64 x i2> %a, i2 {{ x }}, i32 1
-  ret <64 x i2> %c
-}
-
-define <64 x i2> @insertelement_idx17_elt{{ x }}(<64 x i2> %a) {
-entry:
-  %c = insertelement <64 x i2> %a, i2 {{ x }}, i32 17
-  ret <64 x i2> %c
-}
-
+{% endfor %}
 {% endfor %}
 
@@ -41 +31 @@
 }
 {% endfor %}
+
+; v32i4 starts here
+{% for name in FunctionNamesI4 %}
+define <32 x i4> @{{name.c}}(<32 x i4> %a, <32 x i4> %b) {
+entry:
+  %c = {{ name.op }} <32 x i4> %a, %b
+  {% if "icmp" in name.op %}
+  %d = sext <32 x i1> %c to <32 x i4>
+  ret <32 x i4> %d
+  {% else %}
+  ret <32 x i4> %c
+  {% endif %}
+}
+{% endfor %}
+
+; v16i8 starts here
+{% for name in FunctionNamesI8 %}
+define <16 x i8> @{{name.c}}(<16 x i8> %a, <16 x i8> %b) {
+entry:
+  %c = {{ name.op }} <16 x i8> %a, %b
+  {% if "icmp" in name.op %}
+  %d = sext <16 x i1> %c to <16 x i8>
+  ret <16 x i8> %d
+  {% else %}
+  ret <16 x i8> %c
+  {% endif %}
+}
+{% endfor %}

trunk/lib_ir/gen/test_llc.pytemplate.cpp

@@ -9 +9 @@
 #include <cstdlib>
 using namespace std;
+{% set Names = FunctionNames + FunctionNamesI4 + FunctionNamesI8 %}
 
 extern "C" {
-{% for name in FunctionNames %}
+{% for name in Names %}
   SIMD_type {{ name.c }}(SIMD_type a, SIMD_type b);
 {% endfor %}
@@ -36 +37 @@
   short x;
 
-  for (unsigned i = 0; i < 5; ++i) {
+  for (unsigned i = 0; i < 50; ++i) {
     fill_random(a, b);
 
-    {% for name in FunctionNames %}
+    {% for name in Names %}
     {% if name.flag == "" %}
     c = {{ name.c }}(a, b);
@@ -45 +46 @@
     if (Store2String(c,1) != Store2String(d,1)) {
       cout << "{{ name.c }} faild." << endl;
+      cout << "A = " << Store2String(a, 1) << endl;
+      cout << "B = " << Store2String(b, 1) << endl;
+      cout << "c = " << Store2String(c, 1) << endl;
+      cout << "cxx=" << Store2String(d, 1) << endl;
+
       return 1;
     }
@@ -52 +58 @@
 
     //Shifting tests need special treatment
-    {% for name in FunctionNames %}
+    {% for name in Names %}
     {% if name.flag == "shifting" %}
-    {% for x in [0, 1] %}
-    b = mvmd<2>::fill({{ x }});
+    {% for x in range(0, name.fw) %}
     c = {{ name.cxx }}<{{ x }}>(a);
+    b = mvmd<{{ name.fw }}>::fill({{ x }});
     d = {{ name.c }}(a, b);
     if (Store2String(c,1) != Store2String(d,1)) {
@@ -68 +74 @@
   }
 
-  //Testcases for insert/extract element
+  //Testcases for insert/extract element on v64i2
   {% for x in range(0, 4) %}
   a = mvmd<32>::fill4(0, 1, 0, 0);