change test

Author: joaosaffran

llvm/lib/Target/DirectX/DXILRootSignature.cpp

@@ -248,23 +248,23 @@ PreservedAnalyses RootSignatureAnalysisPrinter::run(Module &M,
 
     OS << indent(Space) << "- Parameters: \n";
     Space++;
-    for (const auto &Param : RS.Parameters) {
-      OS << indent(Space) << "Type: " << &Param.ParameterType << " \n";
-      OS << indent(Space) << "ShaderVisibility: " << &Param.ShaderVisibility
-         << " \n";
+    for (const auto &P : RS.Parameters) {
+      OS << indent(Space) << "Type: " << (uint32_t)P.ParameterType << " \n";
+      OS << indent(Space)
+         << "ShaderVisibility: " << (uint32_t)P.ShaderVisibility << " \n";
       Space++;
 
-      switch (Param.ParameterType) {
+      switch (P.ParameterType) {
 
       case dxbc::RootParameterType::Constants32Bit: {
         OS << indent(Space) << "- Constants: \n";
         Space++;
-        OS << indent(Space)
-           << "RegisterSpace: " << &Param.Constants.RegisterSpace << " \n";
-        OS << indent(Space)
-           << "ShaderRegister: " << &Param.Constants.ShaderRegister << " \n";
-        OS << indent(Space)
-           << "Num32BitValues: " << &Param.Constants.Num32BitValues << " \n";
+        OS << indent(Space) << "RegisterSpace: " << P.Constants.RegisterSpace
+           << " \n";
+        OS << indent(Space) << "ShaderRegister: " << P.Constants.ShaderRegister
+           << " \n";
+        OS << indent(Space) << "Num32BitValues: " << P.Constants.Num32BitValues
+           << " \n";
         Space--;
       } break;
       case dxbc::RootParameterType::Empty:

llvm/test/CodeGen/DirectX/ContainerData/RootSignature-Constants.ll

@@ -1,5 +1,5 @@
 ; RUN: opt %s -dxil-embed -dxil-globals -S -o - | FileCheck %s
-; RUN: llc %s --filetype=obj -o - | obj2yaml | FileCheck %s --check-prefix=DXC
+; RUN: opt -passes='print<dxil-root-signature>' %s -S -o - 2>&1 | FileCheck %s --check-prefix=DXC
 
 target triple = "dxil-unknown-shadermodel6.0-compute"
 
@@ -18,16 +18,18 @@ attributes #0 = { "hlsl.numthreads"="1,1,1" "hlsl.shader"="compute" }
 !4 = !{ !"RootConstants", i32 0, i32 1, i32 2, i32 3 }
 
 
-; DXC: - Name:            RTS0
-; DXC-NEXT:    Size:            48
-; DXC-NEXT:    RootSignature:
-; DXC-NEXT:      Version:         2
-; DXC-NEXT:      NumStaticSamplers: 0
-; DXC-NEXT:      StaticSamplersOffset: 44
-; DXC-NEXT:      Parameters:
-; DXC-NEXT:        - ParameterType:   Constants32Bit
-; DXC-NEXT:          ShaderVisibility: All
-; DXC-NEXT:          Constants:
-; DXC-NEXT:            Num32BitValues:  3
-; DXC-NEXT:            RegisterSpace:   2
-; DXC-NEXT:            ShaderRegister:  1
+; DXC: Root Signature Definitions
+; DXC-NEXT: Definition for 'main':
+; DXC-NEXT:  Flags: 0x000000:
+; DXC-NEXT:  Version: 2:
+; DXC-NEXT:  NumParameters: 1:
+; DXC-NEXT:  RootParametersOffset: 20:
+; DXC-NEXT:  NumStaticSamplers: 0:
+; DXC-NEXT:  StaticSamplersOffset: 28:
+; DXC-NEXT:  - Parameters: 
+; DXC-NEXT:   Type: 1 
+; DXC-NEXT:   ShaderVisibility: 0 
+; DXC-NEXT:    - Constants: 
+; DXC-NEXT:     RegisterSpace: 2 
+; DXC-NEXT:     ShaderRegister: 1 
+; DXC-NEXT:     Num32BitValues: 3