commit 48f56a40d352d8d036777ea4714c51e11001082f
author David Neto <dneto@google.com> Fri Oct 06 16:44:25 2017 -0400
committer David Neto <dneto@google.com> Fri Oct 06 16:58:21 2017 -0400
tree 04ec0fbeb3939c2211335528768d3ec25a8b466d
parent 0736b9ce75638a925a1cd9ab65810bc74f5be53a

Add kernel argType field in descriptormap

lib/ClusterPodKernelArgumentsPass.cpp

diff --git a/lib/ClusterPodKernelArgumentsPass.cpp b/lib/ClusterPodKernelArgumentsPass.cpp
index 056d030..ad09807 100644
--- a/lib/ClusterPodKernelArgumentsPass.cpp
+++ b/lib/ClusterPodKernelArgumentsPass.cpp
@@ -36,6 +36,7 @@
 #include <llvm/Pass.h>
 #include <llvm/Support/raw_ostream.h>
 
+#include "ArgType.h"
 
 using namespace llvm;
 
@@ -48,6 +49,7 @@
 
   bool runOnModule(Module &M) override;
 };
+
 } // namespace
 
 char ClusterPodKernelArgumentsPass::ID = 0;
@@ -93,6 +95,9 @@
       // This is always zero for non-POD arguments.  For a POD argument,
       // this is the byte offset within the POD arguments struct.
       unsigned offset;
+      // Argument type.  Same range of values as the result of
+      // clspv::GetArgTypeForType.
+      const char* arg_type;
     };
 
     // In OpenCL, kernel arguments are either pointers or POD. A composite with
@@ -108,7 +113,8 @@
       if (isa<PointerType>(ArgTy)) {
         PtrArgTys.push_back(ArgTy);
         RemapInfo.push_back({std::string(Arg.getName()), arg_index,
-                             unsigned(RemapInfo.size()), 0u});
+                             unsigned(RemapInfo.size()), 0u,
+                             clspv::GetArgTypeForType(ArgTy)});
       } else {
         PodArgTys.push_back(ArgTy);
       }
@@ -134,7 +140,8 @@
         if (!isa<PointerType>(ArgTy)) {
           RemapInfo.push_back(
               {std::string(Arg.getName()), arg_index, num_pointer_args,
-               unsigned(StructLayout->getElementOffset(pod_index++))});
+               unsigned(StructLayout->getElementOffset(pod_index++)),
+               clspv::GetArgTypeForType(ArgTy)});
         }
         arg_index++;
       }
@@ -179,6 +186,7 @@
       //  - Byte offset within the argument.  This is always 0 for pointer
       //    arguments.  For POD arguments this is the offest within the POD
       //    argument struct.
+      //  - Argument type
       LLVMContext& Context = M.getContext();
       SmallVector<Metadata*, 8> mappings;
       for (auto &arg_mapping : RemapInfo) {
@@ -189,8 +197,9 @@
             ConstantAsMetadata::get(Builder.getInt32(arg_mapping.new_index));
         auto *offset =
             ConstantAsMetadata::get(Builder.getInt32(arg_mapping.offset));
-        auto *arg_md =
-            MDNode::get(Context, {name_md, old_index_md, new_index_md, offset});
+        auto *argtype_md = MDString::get(Context, arg_mapping.arg_type);
+        auto *arg_md = MDNode::get(
+            Context, {name_md, old_index_md, new_index_md, offset, argtype_md});
         mappings.push_back(arg_md);
       }