s/getInput/getArg/g (just to make things consistent with the previous related renaming)

diff --git a/backend/src/backend/context.cpp b/backend/src/backend/context.cpp
index 96d3fde..5069d52 100644 (file)
--- a/backend/src/backend/context.cpp
+++ b/backend/src/backend/context.cpp
@@ -81,7 +81,7 @@ namespace gbe
     // Go over the arguments and find the related patch locations
     const uint32_t argNum = fn.argNum();
     for (uint32_t argID = 0u; argID < argNum; ++argID) {
-      const ir::FunctionArgument &arg = fn.getInput(argID);
+      const ir::FunctionArgument &arg = fn.getArg(argID);
       // For pointers and values, we have nothing to do. We just push the values
       if (arg.type == ir::FunctionArgument::GLOBAL_POINTER ||
           arg.type == ir::FunctionArgument::CONSTANT_POINTER ||
@@ -170,7 +170,7 @@ namespace gbe
     kernel->argNum = fn.argNum();
     kernel->args = GBE_NEW_ARRAY(KernelArgument, kernel->argNum);
     for (uint32_t argID = 0; argID < kernel->argNum; ++argID) {
-      const auto &arg = fn.getInput(argID);
+      const auto &arg = fn.getArg(argID);
       switch (arg.type) {
         case ir::FunctionArgument::VALUE:
         case ir::FunctionArgument::STRUCTURE:
@@ -306,7 +306,7 @@ namespace gbe
 
   bool Context::isScalarReg(const ir::Register &reg) const {
     GBE_ASSERT(fn.getProfile() == ir::Profile::PROFILE_OCL);
-    if (fn.getInput(reg) != NULL) return true;
+    if (fn.getArg(reg) != NULL) return true;
     if (fn.getPushLocation(reg) != NULL) return true;
     if (reg == ir::ocl::groupid0  ||
         reg == ir::ocl::groupid1  ||

diff --git a/backend/src/backend/gen_context.cpp b/backend/src/backend/gen_context.cpp
index 93db921..527e03e 100644 (file)
--- a/backend/src/backend/gen_context.cpp
+++ b/backend/src/backend/gen_context.cpp
@@ -152,7 +152,7 @@ namespace gbe
   uint32_t GenContext::createGenReg(ir::Register reg, uint32_t grfOffset) {
     using namespace ir;
     if (fn.isSpecialReg(reg) == true) return grfOffset; // already done
-    if (fn.getInput(reg) != NULL) return grfOffset; // already done
+    if (fn.getArg(reg) != NULL) return grfOffset; // already done
     if (fn.getPushLocation(reg) != NULL) return grfOffset; // already done
     GBE_ASSERT(this->isScalarReg(reg) == false);
     const RegisterData regData = fn.getRegisterData(reg);
@@ -218,7 +218,7 @@ namespace gbe
     // Allocate all (non-structure) argument parameters
     const uint32_t argNum = fn.argNum();
     for (uint32_t argID = 0; argID < argNum; ++argID) {
-      const FunctionArgument &arg = fn.getInput(argID);
+      const FunctionArgument &arg = fn.getArg(argID);
       GBE_ASSERT(arg.type == FunctionArgument::GLOBAL_POINTER ||
                  arg.type == FunctionArgument::CONSTANT_POINTER ||
                  arg.type == FunctionArgument::VALUE ||

diff --git a/backend/src/backend/sim_context.cpp b/backend/src/backend/sim_context.cpp
index 7531251..1b40b51 100644 (file)
--- a/backend/src/backend/sim_context.cpp
+++ b/backend/src/backend/sim_context.cpp
@@ -116,7 +116,7 @@ namespace gbe
     // Load the function arguments
     const uint32_t argNum = fn.argNum();
     for (uint32_t argID = 0; argID < argNum; ++argID) {
-      const ir::FunctionArgument &arg = fn.getInput(argID);
+      const ir::FunctionArgument &arg = fn.getArg(argID);
       const ir::Register reg = arg.reg;
       const int32_t offset = kernel->getCurbeOffset(GBE_CURBE_KERNEL_ARGUMENT, argID);
       // XXX add support for these items

diff --git a/backend/src/ir/function.cpp b/backend/src/ir/function.cpp
index 99b882a..fdc513a 100644 (file)
--- a/backend/src/ir/function.cpp
+++ b/backend/src/ir/function.cpp
@@ -170,7 +170,7 @@ namespace ir {
     out << "## " << fn.argNum() << " input register"
         << plural(fn.argNum())  << " ##" << std::endl;
     for (uint32_t i = 0; i < fn.argNum(); ++i) {
-      const FunctionArgument &input = fn.getInput(i);
+      const FunctionArgument &input = fn.getArg(i);
       out << "decl_input.";
       switch (input.type) {
         case FunctionArgument::GLOBAL_POINTER: out << "global"; break;

diff --git a/backend/src/ir/function.hpp b/backend/src/ir/function.hpp
index fe73ffa..a04ad45 100644 (file)
--- a/backend/src/ir/function.hpp
+++ b/backend/src/ir/function.hpp
@@ -209,11 +209,11 @@ namespace ir {
     /*! Fast allocation / deallocation of instructions */
     DECL_POOL(Instruction, insnPool);
     /*! Get input argument */
-    INLINE const FunctionArgument &getInput(uint32_t ID) const {
+    INLINE const FunctionArgument &getArg(uint32_t ID) const {
       GBE_ASSERT(ID < argNum() && args[ID] != NULL);
       return *args[ID];
     }
-    INLINE FunctionArgument &getInput(uint32_t ID) {
+    INLINE FunctionArgument &getArg(uint32_t ID) {
       GBE_ASSERT(ID < argNum() && args[ID] != NULL);
       return *args[ID];
     }
@@ -234,7 +234,7 @@ namespace ir {
     /*! Get input argument from the register (linear research). Return NULL if
      *  this is not an input argument
      */
-    INLINE const FunctionArgument *getInput(const Register &reg) const {
+    INLINE const FunctionArgument *getArg(const Register &reg) const {
       for (auto it = args.begin(); it != args.end(); ++it)
         if ((*it)->reg == reg) return *it;
       return NULL;

diff --git a/backend/src/ir/lowering.cpp b/backend/src/ir/lowering.cpp
index a99ff65..ce597e1 100644 (file)
--- a/backend/src/ir/lowering.cpp
+++ b/backend/src/ir/lowering.cpp
@@ -121,6 +121,7 @@ namespace ir {
 
   INLINE uint64_t getOffsetFromImm(const Immediate &imm) {
     switch (imm.type) {
+      // bit-cast these ones
       case TYPE_DOUBLE:
       case TYPE_FLOAT:
       case TYPE_S64:
@@ -128,6 +129,7 @@ namespace ir {
       case TYPE_U32:
       case TYPE_U16:
       case TYPE_U8: return imm.data.u64;
+      // sign extend these ones
       case TYPE_S32: return int64_t(imm.data.s32);
       case TYPE_S16: return int64_t(imm.data.s16);
       case TYPE_S8: return int64_t(imm.data.s8);
@@ -181,7 +183,7 @@ namespace ir {
     // replace
     const uint32_t argNum = fn->argNum();
     for (uint32_t argID = 0; argID < argNum; ++argID) {
-      FunctionArgument &arg = fn->getInput(argID);
+      FunctionArgument &arg = fn->getArg(argID);
       if (arg.type != FunctionArgument::STRUCTURE) continue;
       this->lower(argID);
     }
@@ -281,7 +283,7 @@ namespace ir {
 
   bool FunctionArgumentLowerer::matchLoadAddImm(uint32_t argID)
   {
-    const FunctionArgument &arg = fn->getInput(argID);
+    const FunctionArgument &arg = fn->getArg(argID);
     LoadAddImmSeq tmpSeq;
 
     // Inspect all uses of the function argument pointer
@@ -343,7 +345,7 @@ namespace ir {
 
   ArgUse FunctionArgumentLowerer::getArgUse(uint32_t argID)
   {
-    FunctionArgument &arg = fn->getInput(argID);
+    FunctionArgument &arg = fn->getArg(argID);
 
     // case 1 - we may store something to the structure argument
     set<const Instruction*> visited;

diff --git a/backend/src/ir/value.cpp b/backend/src/ir/value.cpp
index 0698e62..131fbb6 100644 (file)
--- a/backend/src/ir/value.cpp
+++ b/backend/src/ir/value.cpp
@@ -106,7 +106,7 @@ namespace ir {
     if (fn.isEntryBlock(bb) == false) return;
 
     // Is it a function input?
-    const FunctionArgument *arg = fn.getInput(reg);
+    const FunctionArgument *arg = fn.getArg(reg);
     const PushLocation *pushed = fn.getPushLocation(reg);
 
     // Is it a pushed register?
@@ -181,7 +181,7 @@ namespace ir {
     // Insert all the values that are not overwritten in the block and alive at
     // the end of it
     for (uint32_t argID = 0; argID < argNum; ++argID) {
-      const FunctionArgument &arg = fn.getInput(argID);
+      const FunctionArgument &arg = fn.getArg(argID);
       const Register reg = arg.reg;
       // Do not transfer dead values
       if (info.inLiveOut(reg) == false) continue;
@@ -322,7 +322,7 @@ namespace ir {
     // Function arguments are also value definitions
     const uint32_t argNum = fn.argNum();
     for (uint32_t argID = 0; argID < argNum; ++argID) {
-      const FunctionArgument &arg = fn.getInput(argID);
+      const FunctionArgument &arg = fn.getArg(argID);
       ValueDef *valueDef = this->newValueDef(&arg);
       defName.insert(std::make_pair(*valueDef, valueDef));
       duGraph.insert(std::make_pair(*valueDef, duEmpty));