fixing tests

Author: joaosaffran

llvm/include/llvm/BinaryFormat/DXContainer.h

@@ -555,7 +555,7 @@ struct RootSignatureValidations {
   }
 
   static bool validateVersion(uint32_t Version) {
-    return (Version < 1 || Version > 2);
+    return !(Version == 1 || Version == 2);
   }
 };
 

llvm/lib/Object/DXContainer.cpp

@@ -246,16 +246,16 @@ Error DirectX::RootSignature::parse(StringRef Data) {
   const char *Current = Data.begin();
 
   // Root Signature headers expects 6 integers to be present.
-  if (Data.size() < 6 * sizeof(uint32_t)) {
-    return parseFailed("Invalid data. Too small.");
-  }
+  if (Data.size() < 6 * sizeof(uint32_t))
+    return parseFailed(
+        "Invalid root signature, insufficient space for header.");
 
   uint32_t VValue =
       support::endian::read<uint32_t, llvm::endianness::little>(Current);
   Current += sizeof(uint32_t);
 
   if (dxbc::RootSignatureValidations::validateVersion(VValue))
-    return make_error<GenericBinaryError>("Invalid Version");
+    return make_error<GenericBinaryError>("Invalid Root Signature Version");
   Version = VValue;
 
   NumParameters =
@@ -279,7 +279,7 @@ Error DirectX::RootSignature::parse(StringRef Data) {
   Current += sizeof(uint32_t);
 
   if (dxbc::RootSignatureValidations::validateRootFlag(FValue))
-    return make_error<GenericBinaryError>("Invalid flag");
+    return make_error<GenericBinaryError>("Invalid Root Signature flag");
   Flags = FValue;
 
   return Error::success();

llvm/lib/Target/DirectX/DXILRootSignature.cpp

@@ -134,7 +134,7 @@ bool ModuleRootSignature::parse(NamedMDNode *Root, const Function *EF) {
 
 bool ModuleRootSignature::validate() {
   if (dxbc::RootSignatureValidations::validateRootFlag(Flags)) {
-    return reportError("Invalid flag value for RootFlag");
+    return reportError("Invalid Root Signature flag value");
   }
   return false;
 }

llvm/unittests/Object/DXContainerTest.cpp

@@ -855,8 +855,10 @@ TEST(RootSignature, ParseRootFlags) {
         0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     };
-    EXPECT_THAT_EXPECTED(DXContainer::create(getMemoryBuffer<64>(Buffer)),
-                         FailedWithMessage("Invalid data. Too small."));
+    EXPECT_THAT_EXPECTED(
+        DXContainer::create(getMemoryBuffer<64>(Buffer)),
+        FailedWithMessage(
+            "Invalid root signature, insufficient space for header."));
   }
   {
     // Version has been changed to an invalid number.
@@ -868,8 +870,9 @@ TEST(RootSignature, ParseRootFlags) {
         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
         0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
     };
-    EXPECT_THAT_EXPECTED(DXContainer::create(getMemoryBuffer<68>(Buffer)),
-                         FailedWithMessage("Invalid Version"));
+    EXPECT_THAT_EXPECTED(
+        DXContainer::create(getMemoryBuffer<68>(Buffer)),
+        FailedWithMessage("Invalid Root Signature Version"));
   }
   {
     // Flag has been set to an invalid value
@@ -881,7 +884,8 @@ TEST(RootSignature, ParseRootFlags) {
         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
         0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0xFF,
     };
-    EXPECT_THAT_EXPECTED(DXContainer::create(getMemoryBuffer<68>(Buffer)),
-                         FailedWithMessage("Invalid flag"));
+    EXPECT_THAT_EXPECTED(
+        DXContainer::create(getMemoryBuffer<68>(Buffer)),
+        FailedWithMessage("Invalid Root Signature flag"));
   }
 }