From 0b23594c8bb061652c7da69d0bef4f1e7c9d28b9 Mon Sep 17 00:00:00 2001
From: Ben Sander <ben.sander@amd.com>
Date: Tue, 3 Oct 2017 20:05:07 +0000
Subject: [PATCH 1/2] [Config] revise submodule configuration for 20171003
 merge

---
 clang             | 2 +-
 clang-tools-extra | 2 +-
 compiler          | 2 +-
 compiler-rt       | 2 +-
 lld               | 2 +-
 rocdl             | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/clang b/clang
index 8be79278b53..71570c903e9 160000
--- a/clang
+++ b/clang
@@ -1 +1 @@
-Subproject commit 8be79278b536f088ca288a358b26275dc63e2b57
+Subproject commit 71570c903e9fe685365c5147355f7562b96a9ba5
diff --git a/clang-tools-extra b/clang-tools-extra
index 32a33a0a0d8..2e2ea73cbf2 160000
--- a/clang-tools-extra
+++ b/clang-tools-extra
@@ -1 +1 @@
-Subproject commit 32a33a0a0d8c51c6bf15a2728115e61052e86db1
+Subproject commit 2e2ea73cbf2d9dc3e660f31370fd6d9a6c3fd7b3
diff --git a/compiler b/compiler
index 5c5ecdc41b0..a5b5346c18c 160000
--- a/compiler
+++ b/compiler
@@ -1 +1 @@
-Subproject commit 5c5ecdc41b0f817ceca4f8765597e762530ceeef
+Subproject commit a5b5346c18cc0397ff71bb7ca255aebda34670f2
diff --git a/compiler-rt b/compiler-rt
index bbec5897ef9..11ba02e9cf5 160000
--- a/compiler-rt
+++ b/compiler-rt
@@ -1 +1 @@
-Subproject commit bbec5897ef9c6cd008b41518778e225139d76a67
+Subproject commit 11ba02e9cf543012a6f97280efb4fe7ff89606a8
diff --git a/lld b/lld
index 451950d5fe3..2d849d24773 160000
--- a/lld
+++ b/lld
@@ -1 +1 @@
-Subproject commit 451950d5fe37fddcf8a7269f84bb7f71090d9049
+Subproject commit 2d849d247737e48ccbc1428cff5b4d11c2b36174
diff --git a/rocdl b/rocdl
index 94b5167ce38..c6b7afea69a 160000
--- a/rocdl
+++ b/rocdl
@@ -1 +1 @@
-Subproject commit 94b5167ce3880c1654f9d24bd5bbe2b45f507a1e
+Subproject commit c6b7afea69ac51768dfd0c4ff180039c4bc08ee7

From 3d742f140b40bdf110bd9d92e6a448d2891630d8 Mon Sep 17 00:00:00 2001
From: "Wen-Heng (Jack) Chung" <whchung@gmail.com>
Date: Wed, 4 Oct 2017 16:00:08 +0000
Subject: [PATCH 2/2] [test] explicitly set 1 AMDGPU target for tests affected

Explicitly set 1 AMDGPU target and do FileCheck for kernel dump on the
particular AMDGPU target.
---
 tests/Unit/AMDGPU/register-control.cpp     | 5 ++---
 tests/Unit/Codegen/indirect-func-arg.cpp   | 5 ++---
 tests/Unit/GridLaunch/register-control.cpp | 5 ++---
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/tests/Unit/AMDGPU/register-control.cpp b/tests/Unit/AMDGPU/register-control.cpp
index 1fae4a00e73..cb69a239a4e 100644
--- 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
index 6b0777a8037..ced94d39a3a 100644
--- 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
index cafa2b32919..62e1f16a65b 100644
--- 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"