X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=utils%2Fshuffle_fuzz.py;h=985d1dab9e23e8ffdf5788bdcb0482d70668ef84;hb=47f0e3f434e2e43f951c3a826c40906cb15b7285;hp=0df2515239a4124707d51e5e6015a6ab6f9022a7;hpb=adc58a657b8179c4dd4a5f97116a38d31decbcff;p=oota-llvm.git

diff --git a/utils/shuffle_fuzz.py b/utils/shuffle_fuzz.py
index 0df2515239a..985d1dab9e2 100755
--- a/utils/shuffle_fuzz.py
+++ b/utils/shuffle_fuzz.py
@@ -20,6 +20,7 @@ import sys
 import uuid
 
 def main():
+  element_types=['i8', 'i16', 'i32', 'i64', 'f32', 'f64']
   parser = argparse.ArgumentParser(description=__doc__)
   parser.add_argument('-v', '--verbose', action='store_true',
                       help='Show verbose output')
@@ -31,26 +32,31 @@ def main():
                       help='Include blends of two input vectors')
   parser.add_argument('--fixed-bit-width', type=int, choices=[128, 256],
                       help='Specify a fixed bit width of vector to test')
+  parser.add_argument('--fixed-element-type', choices=element_types,
+                      help='Specify a fixed element type to test')
   parser.add_argument('--triple',
                       help='Specify a triple string to include in the IR')
   args = parser.parse_args()
 
   random.seed(args.seed)
 
+  if args.fixed_element_type is not None:
+    element_types=[args.fixed_element_type]
+
   if args.fixed_bit_width is not None:
     if args.fixed_bit_width == 128:
+      width_map={'i64': 2, 'i32': 4, 'i16': 8, 'i8': 16, 'f64': 2, 'f32': 4}
       (width, element_type) = random.choice(
-          [(2, 'i64'), (4, 'i32'), (8, 'i16'), (16, 'i8'),
-           (2, 'f64'), (4, 'f32')])
+          [(width_map[t], t) for t in element_types])
     elif args.fixed_bit_width == 256:
-      (width, element_type) = random.choice([
-          (4, 'i64'), (8, 'i32'), (16, 'i16'), (32, 'i8'),
-          (4, 'f64'), (8, 'f32')])
+      width_map={'i64': 4, 'i32': 8, 'i16': 16, 'i8': 32, 'f64': 4, 'f32': 8}
+      (width, element_type) = random.choice(
+          [(width_map[t], t) for t in element_types])
     else:
       sys.exit(1) # Checked above by argument parsing.
   else:
     width = random.choice([2, 4, 8, 16, 32, 64])
-    element_type = random.choice(['i8', 'i16', 'i32', 'i64', 'f32', 'f64'])
+    element_type = random.choice(element_types)
 
   element_modulus = {
       'i8': 1 << 8, 'i16': 1 << 16, 'i32': 1 << 32, 'i64': 1 << 64,
@@ -167,7 +173,7 @@ entry:""" % dict(subst,
   # Generate some string constants that we can use to report errors.
   for i, r in enumerate(result):
     if r != -1:
-      s = ('FAIL(%(seed)s): lane %(lane)d, expected %(result)d, found %%d\\0A' %
+      s = ('FAIL(%(seed)s): lane %(lane)d, expected %(result)d, found %%d\n\\0A' %
            {'seed': args.seed, 'lane': i, 'result': r})
       s += ''.join(['\\00' for _ in itertools.repeat(None, 128 - len(s) + 2)])
       print """
@@ -229,8 +235,7 @@ die.%(i)d:
   %%bad.%(i)d = trunc i2048 %%tmp.%(i)d to i32
   call i32 (i8*, i8*, ...)* @sprintf(i8* %%str.ptr, i8* getelementptr inbounds ([128 x i8]* @error.%(i)d, i32 0, i32 0), i32 %%bad.%(i)d)
   %%length.%(i)d = call i32 @strlen(i8* %%str.ptr)
-  %%size.%(i)d = add i32 %%length.%(i)d, 1
-  call i32 @write(i32 2, i8* %%str.ptr, i32 %%size.%(i)d)
+  call i32 @write(i32 2, i8* %%str.ptr, i32 %%length.%(i)d)
   call void @llvm.trap()
   unreachable
 """ % dict(subst, i=i, next_i=i + 1, r=r)