[AMDGPU] Fix bug 31610

[kzhuravl]

Summary

Was able to reproduce and verify on base/archlinux:latest with gcc (GCC) 6.3.1 20170306 with:
cmake -G 'Unix Makefiles' -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_INSTALL_PREFIX:PATH=/usr -DLLVM_APPEND_VC_REV:BOOL=ON -DLLVM_ENABLE_RTTI:BOOL=ON -DLLVM_ENABLE_FFI:BOOL=ON -DFFI_INCLUDE_DIR:PATH="$(pkg-config --variable=includedir libffi)" -DFFI_LIBRARY_DIR:PATH="$(pkg-config --variable=libdir libffi)" -DLLVM_BUILD_DOCS:BOOL=ON -DLLVM_ENABLE_SPHINX:BOOL=ON -DSPHINX_OUTPUT_HTML:BOOL=ON -DSPHINX_OUTPUT_MAN:BOOL=ON -DSPHINX_WARNINGS_AS_ERRORS:BOOL=OFF -DLLVM_BUILD_LLVM_DYLIB:BOOL=ON -DLLVM_LINK_LLVM_DYLIB:BOOL=ON -DLLVM_BINUTILS_INCDIR:PATH=/usr/include "../${_pkgname}"

[kerberizer]

I can confirm that this fixes the LLVM regression tests on Arch Linux. Many thanks for finding the cause and fixing it.

[100%] Running the LLVM regression tests
-- Testing: 20099 tests, 64 threads --
Testing: 0 .. 10.. 20.. 30.. 40.. 50.. 60.. 70.. 80.. 90.. 
Testing Time: 121.54s
  Expected Passes    : 19351
  Expected Failures  : 137
  Unsupported Tests  : 611
[100%] Built target check-llvm

[kzhuravl]

In D31258#708062, @kerberizer wrote:

I can confirm that this fixes the LLVM regression tests on Arch Linux. Many thanks for finding the cause and fixing it.

[100%] Running the LLVM regression tests
-- Testing: 20099 tests, 64 threads --
Testing: 0 .. 10.. 20.. 30.. 40.. 50.. 60.. 70.. 80.. 90.. 
Testing Time: 121.54s
  Expected Passes    : 19351
  Expected Failures  : 137
  Unsupported Tests  : 611
[100%] Built target check-llvm

Thanks for verifying and providing directions to reproduce. rL298551.

llvm/trunk/lib/Target/AMDGPU/AMDGPURuntimeMetadata.h

 #include <cstdint>
 #include <vector>
 #include <string>
 
 namespace AMDGPU {
 namespace RuntimeMD {
 
   // Version and revision of runtime metadata
-  const unsigned char MDVersion   = 2;
-  const unsigned char MDRevision  = 1;
+  const uint32_t MDVersion   = 2;
+  const uint32_t MDRevision  = 1;
 
   // Name of keys for runtime metadata.
   namespace KeyName {
 
     // Runtime metadata version
     const char MDVersion[] = "amd.MDVersion";
 
     // Instruction set architecture information
namespace RuntimeMD {
   } // end namespace KernelArg
 
   namespace Kernel {
 
     // In-memory representation of kernel information.
     struct Metadata {
       std::string Name;
       std::string Language;
-      std::vector<uint8_t> LanguageVersion;
+      std::vector<uint32_t> LanguageVersion;
       std::vector<uint32_t> ReqdWorkGroupSize;
       std::vector<uint32_t> WorkGroupSizeHint;
       std::string VecTypeHint;
       uint32_t KernelIndex = INVALID_KERNEL_INDEX;
       uint8_t NoPartialWorkGroups = 0;
       std::vector<KernelArg::Metadata> Args;
 
       Metadata() = default;
namespace IsaInfo {
     };
 
   } // end namespace IsaInfo
 
   namespace Program {
 
     // In-memory representation of program information.
     struct Metadata {
-      std::vector<uint8_t> MDVersionSeq;
+      std::vector<uint32_t> MDVersionSeq;
       IsaInfo::Metadata IsaInfo;
       std::vector<std::string> PrintfInfo;
       std::vector<Kernel::Metadata> Kernels;
 
       explicit Metadata() = default;
 
       // Construct from an YAML string.
       explicit Metadata(const std::string &YAML);

llvm/trunk/lib/Target/AMDGPU/MCTargetDesc/AMDGPURuntimeMD.cpp

 static cl::opt<bool>
 DumpRuntimeMD("amdgpu-dump-rtmd",
               cl::desc("Dump AMDGPU runtime metadata"));
 
 static cl::opt<bool>
 CheckRuntimeMDParser("amdgpu-check-rtmd-parser", cl::Hidden,
                      cl::desc("Check AMDGPU runtime metadata YAML parser"));
 
-LLVM_YAML_IS_FLOW_SEQUENCE_VECTOR(uint8_t)
 LLVM_YAML_IS_FLOW_SEQUENCE_VECTOR(uint32_t)
 LLVM_YAML_IS_FLOW_SEQUENCE_VECTOR(std::string)
 LLVM_YAML_IS_SEQUENCE_VECTOR(Kernel::Metadata)
 LLVM_YAML_IS_SEQUENCE_VECTOR(KernelArg::Metadata)
 
 namespace llvm {
 namespace yaml {
 
static Kernel::Metadata getRuntimeMDForKernel(const Function &F) {
   auto &M = *F.getParent();
 
   // Set Language and LanguageVersion.
   if (auto MD = M.getNamedMetadata("opencl.ocl.version")) {
     if (MD->getNumOperands() != 0) {
       auto Node = MD->getOperand(0);
       if (Node->getNumOperands() > 1) {
         Kernel.Language = "OpenCL C";
-        uint16_t Major = mdconst::extract<ConstantInt>(Node->getOperand(0))
+        uint32_t Major = mdconst::extract<ConstantInt>(Node->getOperand(0))
                          ->getZExtValue();
-        uint16_t Minor = mdconst::extract<ConstantInt>(Node->getOperand(1))
+        uint32_t Minor = mdconst::extract<ConstantInt>(Node->getOperand(1))
                          ->getZExtValue();
         Kernel.LanguageVersion.push_back(Major);
         Kernel.LanguageVersion.push_back(Minor);
       }
     }
   }
 
   const DataLayout &DL = F.getParent()->getDataLayout();