GBE: remove sampler address space.

As now sampler_t is a normal integer data type, we don't
need the sampler address space any more.

Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
Tested-by: Lv, Meng <meng.lv@intel.com>

diff --git a/backend/src/ir/instruction.cpp b/backend/src/ir/instruction.cpp
index 8980abf..e8d52ae 100644 (file)
--- a/backend/src/ir/instruction.cpp
+++ b/backend/src/ir/instruction.cpp
@@ -915,7 +915,6 @@ namespace ir {
       case MEM_CONSTANT: return out << "constant";
       case MEM_PRIVATE: return out << "private";
       case IMAGE: return out << "image";
-      case SAMPLER: return out << "sampler";
       case MEM_INVALID: return out << "invalid";
     };
     return out;

diff --git a/backend/src/ir/instruction.hpp b/backend/src/ir/instruction.hpp
index ec5d250..23ed5c9 100644 (file)
--- a/backend/src/ir/instruction.hpp
+++ b/backend/src/ir/instruction.hpp
@@ -50,7 +50,6 @@ namespace ir {
     MEM_CONSTANT,   //!< Immutable global memory
     MEM_PRIVATE,    //!< Per thread private memory
     IMAGE,          //!< For texture image.
-    SAMPLER,        //!< For sampler.
     MEM_INVALID
   };
 

diff --git a/backend/src/llvm/llvm_gen_backend.cpp b/backend/src/llvm/llvm_gen_backend.cpp
index 7379a78..e7ddcf0 100644 (file)
--- a/backend/src/llvm/llvm_gen_backend.cpp
+++ b/backend/src/llvm/llvm_gen_backend.cpp
@@ -256,7 +256,6 @@ namespace gbe
       case 2: return ir::MEM_CONSTANT;
       case 3: return ir::MEM_LOCAL;
       case 4: return ir::IMAGE;
-      case 5: return ir::SAMPLER;
     }
     GBE_ASSERT(false);
     return ir::MEM_GLOBAL;
@@ -916,8 +915,6 @@ namespace gbe
               case ir::IMAGE:
                 ctx.input(argName, ir::FunctionArgument::IMAGE, reg, ptrSize);
               break;
-              case ir::SAMPLER:
-                ctx.input(argName, ir::FunctionArgument::SAMPLER, reg, ptrSize);
               break;
               default: GBE_ASSERT(addrSpace != ir::MEM_PRIVATE);
             }

diff --git a/backend/src/ocl_stdlib.h b/backend/src/ocl_stdlib.h
index e9e407a..c184156 100644 (file)
--- a/backend/src/ocl_stdlib.h
+++ b/backend/src/ocl_stdlib.h
@@ -76,7 +76,6 @@ struct _image2d_t;
 typedef __texture struct _image2d_t* image2d_t;
 struct _image3d_t;
 typedef __texture struct _image3d_t* image3d_t;
-//typedef __sampler const uint* sampler_t;
 typedef uint sampler_t;
 typedef size_t event_t;
 /////////////////////////////////////////////////////////////////////////////