Merge pull request #28 from llvm/master

Pull down llvm/llvm-test-suite changes

Author: vladimirlaz

CMakeLists.txt

@@ -4,6 +4,12 @@ include(CheckSymbolExists)
 
 project(test-suite C CXX)
 
+function(append value)
+  foreach(variable ${ARGN})
+    set(${variable} "${${variable}} ${value}" PARENT_SCOPE)
+  endforeach(variable)
+endfunction()
+
 # The test-suite is designed to be built in release mode anyway and
 # falls over unless -DNDEBUG is set.
 if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
@@ -156,6 +162,11 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TEST_SUITE_DIAGNOSE_FLAGS}")
 set(CMAKE_EXE_LINKER_FLAGS
     "${CMAKE_EXE_LINKER_FLAGS} ${TEST_SUITE_DIAGNOSE_LINKER_FLAGS}")
 
+if (TESTSUITE_USE_LINKER)
+    append("-fuse-ld=${TESTSUITE_USE_LINKER}"
+    CMAKE_EXE_LINKER_FLAGS CMAKE_MODULE_LINKER_FLAGS CMAKE_SHARED_LINKER_FLAG)
+endif()
+
 # Append extra flags. These extra flags are mainly meant for cache files that
 # want to apply flags that get not override even when the user manually
 # specifies CMAKE_C_FLAGS and similar.

External/CUDA/CMakeLists.txt

@@ -98,6 +98,7 @@ macro(create_local_cuda_tests VariantSuffix)
   create_one_local_test(empty empty.cu)
   create_one_local_test(printf printf.cu)
   create_one_local_test(future future.cu)
+  create_one_local_test(builtin_var builtin_var.cu)
   # We only need SIMD tests on CUDA-8.0 to verivy that our reference is correct
   # and matches NVIDIA-provided one.  and on CUDA-9.2 to verify that clang's
   # implementation matches the reference.  This test also happens to be the

External/CUDA/builtin_var.cu

@@ -0,0 +1,20 @@
+__global__ void kernel() {
+  // Verify that *Idx/*Dim can be assigned to uint3/dim3.
+  uint3 thread_idx = threadIdx;
+  uint3 block_idx = blockIdx;
+  dim3 block_dim = blockDim;
+  dim3 grid_dim = gridDim;
+
+  // And that they can be converted to uint3/dim3
+  dim3 thread_idx_dim = threadIdx;
+  dim3 block_idx_dim = blockIdx;
+  uint3 block_dim_uint = blockDim;
+  uint3 grid_dim_uint = gridDim;
+}
+
+int main(int argc, char* argv[]) {
+  kernel<<<2, 2>>>();
+  cudaDeviceSynchronize();
+  cudaDeviceReset();
+  return 0;
+}

SingleSource/UnitTests/Vector/AArch64/aarch64_neon_intrinsics.reference_output

@@ -94,7 +94,9 @@ def getUserTime(filename):
 
 
 def getUserTimeFromContents(contents):
-    line = [line for line in contents.splitlines() if line.startswith('user')]
+    from_bytes = lambda s: s.decode("utf-8") if type(s) == bytes else s
+    lines = [from_bytes(l) for l in contents.splitlines()]
+    line = [line for line in lines if line.startswith('user')]
     assert len(line) == 1
 
     m = re.match(r'user\s+([0-9.]+)', line[0])

litsupport/modules/timeit.py

@@ -207,10 +207,14 @@ def format_diff(value):
     else:
         return "%-5d" % value
 
-def print_result(d, limit_output=True, shorten_names=True,
-                 show_diff_column=True, sortkey='diff'):
+def print_result(d, limit_output=True, shorten_names=True, minimal_names=False,
+                 show_diff_column=True, sortkey='diff', sort_by_abs=True):
     # sort (TODO: is there a more elegant way than create+drop a column?)
-    d['$sortkey'] = d[sortkey].abs()
+    if sort_by_abs:
+        d['$sortkey'] = d[sortkey].abs()
+    else:
+        d['$sortkey'] = d[sortkey]
+
     d = d.sort_values("$sortkey", ascending=False)
     del d['$sortkey']
     if not show_diff_column:
@@ -236,7 +240,17 @@ def format_name(name, common_prefix, common_suffix):
                 name = name[:-common_suffix]
             return "%-45s" % truncate(name, 10, 30)
 
-        formatters['Program'] = lambda name: format_name(name, drop_prefix, drop_suffix)
+
+        def strip_name_fully(name):
+            name = name.split('/')[-1]
+            if name.endswith('.test'):
+                name = name[:-5]
+            return name
+
+        if minimal_names:
+            formatters['Program'] = strip_name_fully
+        else:
+            formatters['Program'] = lambda name: format_name(name, drop_prefix, drop_suffix)
     def float_format(x):
         if x == '':
             return ''
@@ -277,6 +291,10 @@ def float_format(x):
     parser.add_argument('--rhs-name', default="rhs",
                         help="Name used to describe right side in 'vs' mode")
     parser.add_argument('files', metavar='FILE', nargs='+', help="To compare two groups of results, put 'vs' between them")
+    parser.add_argument('--minimal-names', action='store_true',
+                        dest='minimal_names', default=False)
+    parser.add_argument('--no-abs-sort', action='store_true',
+                        dest='no_abs_sort', default=False, help="Don't use abs() when sorting results")
     config = parser.parse_args()
 
     if config.show_diff is None:
@@ -371,4 +389,4 @@ def float_format(x):
     print("")
     shorten_names = not config.full
     limit_output = (not config.all) and (not config.full)
-    print_result(data, limit_output, shorten_names, config.show_diff, sortkey)
+    print_result(data, limit_output, shorten_names, config.minimal_names, config.show_diff, sortkey, config.no_abs_sort)