intel
diff --git a/‎IGC/AdaptorCommon/IRUpgrader/IRUpgrader.hpp
Lines changed: 40 additions & 0 deletions b/‎IGC/AdaptorCommon/IRUpgrader/IRUpgrader.hpp
Lines changed: 40 additions & 0 deletions
diff --git a/‎IGC/AdaptorCommon/IRUpgrader/UpgraderResourceAccess.cpp
Lines changed: 217 additions & 0 deletions b/‎IGC/AdaptorCommon/IRUpgrader/UpgraderResourceAccess.cpp
Lines changed: 217 additions & 0 deletions
diff --git a/‎IGC/AdaptorOCL/SPIRV/SPIRVInternal.h
Lines changed: 10 additions & 1 deletion b/‎IGC/AdaptorOCL/SPIRV/SPIRVInternal.h
Lines changed: 10 additions & 1 deletion
diff --git a/‎IGC/AdaptorOCL/SPIRV/SPIRVReader.cpp
Lines changed: 3 additions & 2 deletions b/‎IGC/AdaptorOCL/SPIRV/SPIRVReader.cpp
Lines changed: 3 additions & 2 deletions
diff --git a/‎IGC/AdaptorOCL/SPIRV/SPIRVUtil.cpp
Lines changed: 48 additions & 11 deletions b/‎IGC/AdaptorOCL/SPIRV/SPIRVUtil.cpp
Lines changed: 48 additions & 11 deletions
@@ -0,0 +1,40 @@
+/*===================== begin_copyright_notice ==================================
+
+Copyright (c) 2017 Intel Corporation
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+======================= end_copyright_notice ==================================*/
+
+
+/// Declaration of upgrader passes. When the IR changes, we add passes to keep compatibility with
+/// clients which haven't moved yet to the new representation.
+
+namespace llvm
+{
+    class Pass;
+}
+namespace IGC
+{
+    /// Transform legacy resource access intrinsics taking an integer representation to 
+    /// the new intrinsics taking pointer representation
+    llvm::Pass* CreateUpgradeResourceIntrinsic();
+}
@@ -0,0 +1,217 @@
+/*===================== begin_copyright_notice ==================================
+
+Copyright (c) 2017 Intel Corporation
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+======================= end_copyright_notice ==================================*/
+
+#include "AdaptorCommon/IRUpgrader/IRUpgrader.hpp"
+#include "GenISAIntrinsics/GenIntrinsics.h"
+#include "Compiler/CISACodeGen/helper.h"
+
+#include <vector>
+
+#include "common/LLVMWarningsPush.hpp"
+#include <llvm/Pass.h>
+#include <llvm/IR/InstVisitor.h>
+#include <llvm/IR/IRBuilder.h>
+#include "common/LLVMWarningsPop.hpp"
+
+using namespace llvm;
+
+class UpgradeResourceAccess : public FunctionPass, public InstVisitor<UpgradeResourceAccess>
+{
+public:
+    UpgradeResourceAccess() : FunctionPass(ID) {}
+    static char ID;
+    void getAnalysisUsage(llvm::AnalysisUsage &AU) const override
+    {
+        AU.setPreservesCFG();
+    }
+    bool runOnFunction(llvm::Function &F) override;
+    void visitCallInst(CallInst& C);
+private:
+    void ChangeIntrinsic(CallInst& C, GenISAIntrinsic::ID ID);
+    void FixSamplerSignature(SampleIntrinsic* sample);
+    bool m_changed = false;
+};
+char UpgradeResourceAccess::ID = 0;
+
+bool UpgradeResourceAccess::runOnFunction(llvm::Function &F)
+{
+    visit(F);
+    return m_changed;
+}
+
+static Value* GetResource(Module* m, IRBuilder<>& builder, Value* i)
+{
+    unsigned int addrSpace = IGC::EncodeAS4GFXResource(*i, IGC::RESOURCE, 0);
+    PointerType* ptrT = PointerType::get(i->getType(), addrSpace);
+    Value* img = nullptr;
+    if(isa<ConstantInt>(i))
+    {
+        img = ConstantPointerNull::get(ptrT);
+    }
+    else
+    {
+        Function* getBufferPointer = GenISAIntrinsic::getDeclaration(m, GenISAIntrinsic::GenISA_GetBufferPtr, ptrT);
+        img = builder.CreateCall(getBufferPointer, { i, builder.getInt32(IGC::RESOURCE) });
+    }
+    return img;
+}
+
+static Value* GetSampler(Module* m, IRBuilder<>& builder, Value* i)
+{
+    unsigned int addrSpace = IGC::EncodeAS4GFXResource(*i, IGC::SAMPLER, 0);
+    PointerType* ptrT = PointerType::get(i->getType(), addrSpace);
+    Value* s = nullptr;
+    if(isa<ConstantInt>(i))
+    {
+        s = ConstantPointerNull::get(ptrT);
+    }
+    else
+    {
+        Function* getBufferPointer = GenISAIntrinsic::getDeclaration(m, GenISAIntrinsic::GenISA_GetBufferPtr, ptrT);
+        s = builder.CreateCall(getBufferPointer, { i, builder.getInt32(IGC::SAMPLER) });
+    }
+    return s;
+}
+
+void UpgradeResourceAccess::ChangeIntrinsic(CallInst& C, GenISAIntrinsic::ID ID)
+{
+    std::vector<Type*> types;
+    std::vector<Value*> args;
+    IRBuilder<> builder(&C);
+    Module* m = C.getParent()->getParent()->getParent();
+    for(unsigned int i = 0; i < C.getNumArgOperands(); i++)
+    {
+        args.push_back(C.getOperand(i));
+    }
+    switch(ID)
+    {
+    case GenISAIntrinsic::GenISA_sampleptr:
+    case GenISAIntrinsic::GenISA_sampleBptr:
+    case GenISAIntrinsic::GenISA_sampleCptr:
+    case GenISAIntrinsic::GenISA_sampleBCptr:
+    case GenISAIntrinsic::GenISA_sampleLptr:
+    case GenISAIntrinsic::GenISA_sampleDptr: 
+    case GenISAIntrinsic::GenISA_sampleKillPix: {
+        types.push_back(C.getType());
+        types.push_back(C.getOperand(0)->getType());
+        unsigned int resIndex = C.getNumOperands() - 6;
+        unsigned int samplerIndex = C.getNumOperands() - 5;
+        args[resIndex] = GetResource(m, builder, args[resIndex]);
+        args[samplerIndex] = GetSampler(m, builder, args[samplerIndex]);
+        types.push_back(args[resIndex]->getType());
+        types.push_back(args[samplerIndex]->getType());
+    }
+        break;
+    case GenISAIntrinsic::GenISA_gather4ptr: {
+        types.push_back(C.getType());
+        types.push_back(C.getOperand(0)->getType());
+        unsigned int resIndex = C.getNumOperands() - 7;
+        unsigned int samplerIndex = C.getNumOperands() - 6;
+        args[resIndex] = GetResource(m, builder, args[resIndex]);
+        args[samplerIndex] = GetSampler(m, builder, args[samplerIndex]);
+        types.push_back(args[resIndex]->getType());
+        types.push_back(args[samplerIndex]->getType());
+    }
+        break;
+    case GenISAIntrinsic::GenISA_ldmsptr:
+    case GenISAIntrinsic::GenISA_ldmcsptr:
+    case GenISAIntrinsic::GenISA_ldptr: {
+        types.push_back(C.getType());
+        unsigned int resIndex = C.getNumOperands() - 5;
+        args[resIndex] = GetResource(m, builder, args[resIndex]);
+        types.push_back(args[resIndex]->getType());
+    }
+        break;
+    default:
+        assert("unhandled intrinsic upgrade" && 0);
+        break;
+    }
+    Function* f = GenISAIntrinsic::getDeclaration(m, ID, types);
+    Value* newCall = builder.CreateCall(f, args);
+    C.replaceAllUsesWith(newCall);
+    C.eraseFromParent();
+    m_changed = true;
+}
+
+void UpgradeResourceAccess::visitCallInst(CallInst& C)
+{
+    if(C.getCalledFunction()->getName().startswith("genx.GenISA.sample."))
+    {
+        ChangeIntrinsic(C, GenISAIntrinsic::GenISA_sampleptr);
+    }
+    else if(C.getCalledFunction()->getName().startswith("genx.GenISA.sampleB."))
+    {
+        ChangeIntrinsic(C, GenISAIntrinsic::GenISA_sampleBptr);
+    }
+    else if(C.getCalledFunction()->getName().startswith("genx.GenISA.sampleD."))
+    {
+        ChangeIntrinsic(C, GenISAIntrinsic::GenISA_sampleDptr);
+    }
+    else if(C.getCalledFunction()->getName().startswith("genx.GenISA.sampleC."))
+    {
+        ChangeIntrinsic(C, GenISAIntrinsic::GenISA_sampleCptr);
+    }
+    else if(C.getCalledFunction()->getName().startswith("genx.GenISA.sampleL."))
+    {
+        ChangeIntrinsic(C, GenISAIntrinsic::GenISA_sampleLptr);
+    }
+    else if(C.getCalledFunction()->getName().startswith("genx.GenISA.gather4."))
+    {
+        ChangeIntrinsic(C, GenISAIntrinsic::GenISA_gather4ptr);
+    }
+    else if(C.getCalledFunction()->getName().startswith("genx.GenISA.ldms."))
+    {
+        ChangeIntrinsic(C, GenISAIntrinsic::GenISA_ldmsptr);
+    }
+    else if(C.getCalledFunction()->getName().equals("genx.GenISA.ldmcs"))
+    {
+        ChangeIntrinsic(C, GenISAIntrinsic::GenISA_ldmcsptr);
+    }
+    else if(C.getCalledFunction()->getName().startswith("genx.GenISA.ld."))
+    {
+        ChangeIntrinsic(C, GenISAIntrinsic::GenISA_ldptr);
+    }
+    else if(C.getCalledFunction()->getName().equals("genx.GenISA.sampleKill.legacy"))
+    {
+        ChangeIntrinsic(C, GenISAIntrinsic::GenISA_sampleKillPix);
+    }
+    else if(SampleIntrinsic* sample = dyn_cast<SampleIntrinsic>(&C))
+    {
+        if(!sample->getTextureValue()->getType()->isPointerTy())
+        {
+            ChangeIntrinsic(*sample, sample->getIntrinsicID());
+        }
+    }
+}
+
+
+namespace IGC 
+{
+Pass* CreateUpgradeResourceIntrinsic()
+{
+    return new UpgradeResourceAccess();
+}
+}
@@ -406,6 +406,15 @@ _SPIRV_OP(OpGenericCastToPtrExplicit)
 _SPIRV_OP(OpSubgroupBallotKHR)
 _SPIRV_OP(OpSubgroupFirstInvocationKHR)
 #undef _SPIRV_OP
+
+// Intel Subgroups builtins
+#define _SPIRV_OP(x, y) add(Op##y, #x);
+_SPIRV_OP(intel_sub_group_shuffle, SubgroupShuffleINTEL)
+_SPIRV_OP(intel_sub_group_shuffle_down, SubgroupShuffleDownINTEL)
+_SPIRV_OP(intel_sub_group_shuffle_up, SubgroupShuffleUpINTEL)
+_SPIRV_OP(intel_sub_group_shuffle_xor, SubgroupShuffleXorINTEL)
+#undef _SPIRV_OP
+
 }
 typedef SPIRVMap<Op, std::string, SPIRVInstruction>
   OCLSPIRVBuiltinMap;
@@ -696,7 +705,7 @@ void decorateSPIRVExtInst(std::string &S, std::vector<Type*> ArgTypes);
 bool isFunctionBuiltin(llvm::Function* F);
 
 /// Get a canonical function name for a SPIR-V op code.
-std::string getSPIRVBuiltinName(Op OC, std::vector<Type*> ArgTypes, std::string suffix);
+std::string getSPIRVBuiltinName(Op OC, SPIRVInstruction *BI, std::vector<Type*> ArgTypes, std::string suffix);
 
 /// Mutates function call instruction by changing the arguments.
 /// \param ArgMutate mutates the function arguments.
 
@@ -2518,7 +2518,8 @@ SPIRVToLLVM::transValueWithoutDecoration(SPIRVValue *BV, Function *F,
     auto OC = BV->getOpCode();
     if (isSPIRVCmpInstTransToLLVMInst(static_cast<SPIRVInstruction*>(BV))) {
       return mapValue(BV, transCmpInst(BV, BB, F));
-    } else if (OCLSPIRVBuiltinMap::find(OC)) {
+    } else if (OCLSPIRVBuiltinMap::find(OC) ||
+               isIntelSubgroupOpCode(OC)) {
        return mapValue(BV, transSPIRVBuiltinFromInst(
           static_cast<SPIRVInstruction *>(BV), BB));
     } else if (isBinaryShiftLogicalBitwiseOpCode(OC) ||
@@ -2852,7 +2853,7 @@ SPIRVToLLVM::transSPIRVBuiltinFromInst(SPIRVInstruction *BI, BasicBlock *BB) {
       ArgTys.insert(ArgTys.begin(), RetTy);
   }
 
-  std::string builtinName(getSPIRVBuiltinName(OC, ArgTys, suffix));
+  std::string builtinName(getSPIRVBuiltinName(OC, BI, ArgTys, suffix));
 
   if (hasReturnTypeInTypeList)
   {
 
@@ -63,6 +63,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 ///
 //===----------------------------------------------------------------------===//
 
+#include "libSPIRV/SPIRVInstruction.h"
 #include "SPIRVInternal.h"
 #include "Mangler/ParameterType.h"
 
@@ -225,17 +226,53 @@ isFunctionBuiltin(llvm::Function* F) {
 }
 
 std::string
-getSPIRVBuiltinName(Op OC, std::vector<Type*> ArgTypes, std::string suffix) {
-   std::string name;
-   if (OCLSPIRVBuiltinMap::find(OC, &name)){
-       name = name + suffix;
-       decorateSPIRVBuiltin(name, ArgTypes);
-   }
-   else
-   {
-       spirv_assert(0 && "Couldn't find opcode in map!");
-   }
-   return name;
+getSPIRVBuiltinName(Op OC, SPIRVInstruction *BI, std::vector<Type*> ArgTypes, std::string suffix) {
+  std::string name = "";
+
+  if (isIntelSubgroupOpCode(OC)) {
+    std::stringstream tmpName;
+    SPIRVType *DataTy = nullptr;
+    switch (OC) {
+    case OpSubgroupBlockReadINTEL:
+    case OpSubgroupImageBlockReadINTEL:
+      tmpName << "intel_sub_group_block_read";
+      DataTy = BI->getType();
+      break;
+    case OpSubgroupBlockWriteINTEL:
+      tmpName << "intel_sub_group_block_write";
+      DataTy = BI->getOperands()[1]->getType();
+      break;
+    case OpSubgroupImageBlockWriteINTEL:
+      tmpName << "intel_sub_group_block_write";
+      DataTy = BI->getOperands()[2]->getType();
+      break;
+    default:
+      tmpName << OCLSPIRVBuiltinMap::map(OC);
+    }
+    if (DataTy) {
+      if (DataTy->getBitWidth() == 16)
+        tmpName << "_us";
+      if (DataTy->isTypeVector()) {
+        if (unsigned ComponentCount = DataTy->getVectorComponentCount())
+          tmpName << ComponentCount;
+      }
+    }
+    name = tmpName.str();
+  } 
+  else 
+  {
+    name = OCLSPIRVBuiltinMap::map(OC);
+  }
+
+  if (!name.empty()) {
+    name = name + suffix;
+    decorateSPIRVBuiltin(name, ArgTypes);
+  }
+  else
+  {
+    spirv_assert(0 && "Couldn't find opcode in map!");
+  }
+  return name;
 }
 
 CallInst *