LWP100-1465 Address calculation test

lib/include/rocRoller/AssemblyKernel.hpp

@@ -154,6 +154,7 @@ namespace rocRoller
          * @param args Vector of CommandArgument pointers that should be added as arguments.
          */
         void                      addCommandArguments(std::vector<CommandArgumentPtr> args);
+        void                      addNewCommandArguments(std::vector<CommandArgumentPtr> args);
         Expression::ExpressionPtr addCommandArgument(CommandArgumentPtr arg);
 
         std::string args_string();

lib/include/rocRoller/AssemblyKernel_impl.hpp

@@ -228,6 +228,15 @@ namespace rocRoller
         }
     }
 
+    inline void AssemblyKernel::addNewCommandArguments(std::vector<CommandArgumentPtr> args)
+    {
+        for(auto arg : args)
+        {
+            if(m_argumentNames.find(arg->name()) == m_argumentNames.end())
+                addCommandArgument(arg);
+        }
+    }
+
     inline Expression::ExpressionPtr AssemblyKernel::addCommandArgument(CommandArgumentPtr arg)
     {
         return addArgument({arg->name(),

lib/include/rocRoller/CommandSolution.hpp

@@ -195,6 +195,17 @@ namespace rocRoller
          */
         void generateKernel();
 
+        /**
+         * @brief Generates the kernel Graph by graph lowering and
+         * doesn't do code-generation.
+         */
+        void generateKernelGraphOnlyAfterTransforms();
+
+        /**
+         * @brief Lower command arguments to kernel arguments. 
+         */
+        void lowerToKernelArguments();
+
         /**
          * @brief Assembles a generated kernel.  Does not try to load
          * it.

lib/source/CommandSolution.cpp

@@ -129,6 +129,8 @@ namespace rocRoller
 
         rv.reserve(m_context->kernel()->argumentSize(), argStructs.size());
 
+        Log::debug("== getKernelArguments ==");
+
         for(auto& arg : argStructs)
         {
             auto value = Expression::evaluate(arg.expression, args);
@@ -145,6 +147,8 @@ namespace rocRoller
                                                      arg.name));
             }
 
+            Log::debug(" arg.name {} value {}", arg.name, toString(value));
+
             rv.append(arg.name, value);
         }
 
@@ -161,11 +165,21 @@ namespace rocRoller
 
         auto const& workitems = m_context->kernel()->workitemCount();
         if(workitems[0])
+        {
             rv.workitemCount[0] = getUnsignedInt(evaluate(workitems[0], args));
+            Log::debug("== getKernelInvocation ==");
+            Log::debug(" workitemCount[0] {}", rv.workitemCount[0]);
+        }
         if(workitems[1])
+        {
             rv.workitemCount[1] = getUnsignedInt(evaluate(workitems[1], args));
+            Log::debug(" workitemCount[1] {}", rv.workitemCount[1]);
+        }
         if(workitems[2])
+        {
             rv.workitemCount[2] = getUnsignedInt(evaluate(workitems[2], args));
+            Log::debug(" workitemCount[2] {}", rv.workitemCount[2]);
+        }
 
         auto const& sharedMem = m_context->kernel()->dynamicSharedMemBytes();
         if(sharedMem)
@@ -211,6 +225,15 @@ namespace rocRoller
         co_yield Instruction::Comment(m_command->argInfo());
     }
 
+    void CommandKernel::lowerToKernelArguments()
+    {
+        for(auto arg : m_command->getArguments())
+        {
+            Log::debug("command argument: {}, {}", arg->toString(), toString(arg->expression()));
+        }
+        m_context->kernel()->addNewCommandArguments(m_command->getArguments());
+    }
+
     void CommandKernel::generateKernelGraph(std::string name)
     {
         TIMER(t, "CommandKernel::generateKernelGraph");
@@ -396,6 +419,23 @@ namespace rocRoller
             generateKernelSource();
         }
         else
+        {
+            Log::debug("generateKernel() is doing nothing");
+            // Probably from a unit test.  The context should contain
+            // scheduled instructions already.
+        }
+    }
+
+    void CommandKernel::generateKernelGraphOnlyAfterTransforms()
+    {
+        TIMER(t, "CommandKernel::generateKernelGraphOnlyAfterTransforms()");
+
+        if(m_command)
+        {
+            // Only lower the KernelGraph and don't generate codes.
+            generateKernelGraph(m_name);
+        }
+        else
         {
             // Probably from a unit test.  The context should contain
             // scheduled instructions already.

test/CMakeLists.txt

@@ -177,6 +177,7 @@ set(
     catch/CustomAssertions.cpp
     catch/TestKernels.cpp
 
+    catch/AddressCalculationTest.cpp
     catch/AnnotateInstructionsTest.cpp
     catch/BinaryExpressionTest.cpp
     catch/BranchGeneratorTest.cpp