Merge pull request #481 from whchung/merge_20171003

[Config] revise submodule configuration for 20171003 merge
ROCm · Oct 4, 2017 · d338cd9 · d338cd9
2 parents 5a043f1 + 3d742f1
commit d338cd9
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 15 deletions.
diff --git a/clang b/clang
diff --git a/clang-tools-extra b/clang-tools-extra
diff --git a/compiler b/compiler
diff --git a/compiler-rt b/compiler-rt
diff --git a/lld b/lld
diff --git a/rocdl b/rocdl
diff --git a/tests/Unit/AMDGPU/register-control.cpp b/tests/Unit/AMDGPU/register-control.cpp
@@ -1,6 +1,5 @@
-// RUN: %hc %s -o %t.out -Xlinker -dump-llvm -Xlinker -dump-dir=%T
-// RUN: %llvm-dis %T/dump*.opt.bc
-// RUN: cat %T/dump*.opt.ll| %FileCheck %s
+// RUN: %hc %s -o %t.out -Xlinker -dump-llvm -Xlinker -dump-dir=%T --amdgpu-target=gfx803
+// RUN: %llvm-dis %T/dump-gfx803.opt.bc -f -o - | %FileCheck %s
 // RUN: %t.out
 
 #include <hc.hpp>

diff --git a/tests/Unit/Codegen/indirect-func-arg.cpp b/tests/Unit/Codegen/indirect-func-arg.cpp
@@ -1,8 +1,7 @@
 // Make a unique directory to save the dumped IR.
 // RUN: mkdir -p %T/indirect-func-arg
-// RUN: %hc %s -o %t.out -Xlinker -dump-llvm -Xlinker -dump-dir=%T/indirect-func-arg
-// RUN: %llvm-dis %T/indirect-func-arg/dump*.opt.bc
-// RUN: cat %T/indirect-func-arg/dump*.opt.ll| %FileCheck %s
+// RUN: %hc %s -o %t.out -Xlinker -dump-llvm -Xlinker -dump-dir=%T/indirect-func-arg --amdgpu-target=gfx803
+// RUN: %llvm-dis %T/indirect-func-arg/dump-gfx803.opt.bc -f -o - | %FileCheck %s
 // RUN: %t.out
 
 #include <hc.hpp>

diff --git a/tests/Unit/GridLaunch/register-control.cpp b/tests/Unit/GridLaunch/register-control.cpp
@@ -1,6 +1,5 @@
-// RUN: %hc -lhc_am %s -o %t.out -Xlinker -dump-llvm -Xlinker -dump-dir=%T
-// RUN: %llvm-dis %T/dump*.opt.bc
-// RUN: cat %T/dump*.opt.ll | %FileCheck %s
+// RUN: %hc -lhc_am %s -o %t.out -Xlinker -dump-llvm -Xlinker -dump-dir=%T --amdgpu-target=gfx803
+// RUN: %llvm-dis %T/dump-gfx803.opt.bc -f -o - | %FileCheck %s
 // RUN: %t.out
 
 #include "grid_launch.hpp"