Use new neon_vector_type and neon_polyvector_type attributes for Neon vectors.

[oota-llvm.git] / utils / TableGen / NeonEmitter.cpp

diff --git a/utils/TableGen/NeonEmitter.cpp b/utils/TableGen/NeonEmitter.cpp
index 1c0edd17dc878293e162c89c411264a0e4e925ac..f4f79493e405976f95978bb8f1a109da520ee826 100644 (file)
--- a/utils/TableGen/NeonEmitter.cpp
+++ b/utils/TableGen/NeonEmitter.cpp
@@ -833,8 +833,8 @@ void NeonEmitter::run(raw_ostream &OS) {
 
   // Emit NEON-specific scalar typedefs.
   OS << "typedef float float32_t;\n";
-  OS << "typedef uint8_t poly8_t;\n";
-  OS << "typedef uint16_t poly16_t;\n";
+  OS << "typedef int8_t poly8_t;\n";
+  OS << "typedef int16_t poly16_t;\n";
   OS << "typedef uint16_t float16_t;\n";
 
   // Emit Neon vector typedefs.
@@ -844,21 +844,25 @@ void NeonEmitter::run(raw_ostream &OS) {
 
   // Emit vector typedefs.
   for (unsigned i = 0, e = TDTypeVec.size(); i != e; ++i) {
-    bool dummy, quad = false;
-    (void) ClassifyType(TDTypeVec[i], quad, dummy, dummy);
-    OS << "typedef __attribute__(( __vector_size__(";
+    bool dummy, quad = false, poly = false;
+    (void) ClassifyType(TDTypeVec[i], quad, poly, dummy);
+    if (poly)
+      OS << "typedef __attribute__((neon_polyvector_type(";
+    else
+      OS << "typedef __attribute__((neon_vector_type(";
       
-    OS << utostr(8*(quad ? 2 : 1)) << ") )) ";
-    if (!quad)
+    unsigned nElts = GetNumElements(TDTypeVec[i], quad);
+    OS << utostr(nElts) << "))) ";
+    if (nElts < 10)
       OS << " ";
       
     OS << TypeString('s', TDTypeVec[i]);
     OS << " " << TypeString('d', TDTypeVec[i]) << ";\n";
   }
   OS << "\n";
-  OS << "typedef __attribute__(( __vector_size__(8) ))  "
+  OS << "typedef __attribute__((__vector_size__(8)))  "
     "double float64x1_t;\n";
-  OS << "typedef __attribute__(( __vector_size__(16) )) "
+  OS << "typedef __attribute__((__vector_size__(16))) "
     "double float64x2_t;\n";
   OS << "\n";