address commentsusers/joaosaffran/152229

4 files changed, 4 insertions, 18 deletions

diff --git a/llvm/lib/Support/DXILABI.cpp b/llvm/lib/Support/DXILABI.cpp
index 8d60e1a1b3ba..c6499b21613f 100644
--- a/llvm/lib/Support/DXILABI.cpp
+++ b/llvm/lib/Support/DXILABI.cpp
@@ -1,5 +1,4 @@
-//===-- DXILABI.cpp - ABI Sensitive Values for DXIL ---------------*- C++

-//-*-===//

+//===-- DXILABI.cpp - ABI Sensitive Values for DXIL --------------*- C++-*-===//

 //

 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

 // See https://llvm.org/LICENSE.txt for license information.

diff --git a/llvm/test/CodeGen/DirectX/rootsignature-validation-constants.ll b/llvm/test/CodeGen/DirectX/rootsignature-validation-constants.ll
deleted file mode 100644
index ab8c51629fa5..000000000000
--- a/llvm/test/CodeGen/DirectX/rootsignature-validation-constants.ll
+++ /dev/null
@@ -1,14 +0,0 @@
-; RUN: opt -S -passes='dxil-post-optimization-validation' -mtriple=dxil-pc-shadermodel6.6-compute %s 2>&1 
-; expected-no-diagnostics
-; Root Signature(RootConstants(num32BitConstants=4, b2))
-
-define void @CSMain() "hlsl.shader"="compute" {
-entry:
-  ret void
-}
-
-!dx.rootsignatures = !{!0}
-
-!0 = !{ptr @CSMain, !1, i32 2}
-!1 = !{!2}
-!2 = !{!"RootConstants", i32 0, i32 2, i32 0, i32 4}
diff --git a/llvm/test/CodeGen/DirectX/rootsignature-validation-fail-sampler.ll b/llvm/test/CodeGen/DirectX/rootsignature-validation-fail-sampler.ll
index a29c00fe0f2f..90f4c6f683e8 100644
--- a/llvm/test/CodeGen/DirectX/rootsignature-validation-fail-sampler.ll
+++ b/llvm/test/CodeGen/DirectX/rootsignature-validation-fail-sampler.ll
@@ -11,4 +11,4 @@ entry:
 !1 = !{!2, !3}
 !2 = !{ !"StaticSampler", i32 5, i32 4, i32 5, i32 3, float 0x3FF7CCCCC0000000, i32 10, i32 2, i32 1, float -1.270000e+02, float 1.220000e+02, i32 42, i32 0, i32 0 }
 !3 = !{!"DescriptorTable", i32 0, !4}
-!4 = !{!"Sampler", i32 1, i32 42, i32 0, i32 -1, i32 0}
\ No newline at end of file
+!4 = !{!"Sampler", i32 1, i32 42, i32 0, i32 -1, i32 0}
diff --git a/llvm/test/CodeGen/DirectX/rootsignature-validation.ll b/llvm/test/CodeGen/DirectX/rootsignature-validation.ll
index 67a57d05e65e..42545886b631 100644
--- a/llvm/test/CodeGen/DirectX/rootsignature-validation.ll
+++ b/llvm/test/CodeGen/DirectX/rootsignature-validation.ll
@@ -17,8 +17,9 @@ entry:
 !dx.rootsignatures = !{!0}
 
 !0 = !{ptr @CSMain, !1, i32 2}
-!1 = !{!2, !3, !5, !7}
+!1 = !{!2, !3, !5, !7, !9}
 !2 = !{!"RootCBV", i32 0, i32 3, i32 1, i32 4}
+!9 = !{!"RootConstants", i32 0, i32 2, i32 0, i32 4}
 !3 = !{!"DescriptorTable", i32 0, !4}
 !4 = !{!"SRV", i32 1, i32 0, i32 0, i32 -1, i32 0}
 !5 = !{!"DescriptorTable", i32 0, !6}