Open Sourcing Gen 11 content for IGC / Clean up fixes in files

Change-Id: Ic329c0e27af25725b41544223f7e5379eb799c3a

Author: paigeale

IGC/AdaptorOCL/OCL/sp/gtpin_igc_ocl.h

@@ -69,7 +69,8 @@ typedef enum
     GEN_ISA_TYPE_GEN7p5 = 3,
     GEN_ISA_TYPE_GEN8 = 4,
     GEN_ISA_TYPE_GEN9 = 5,
-    GEN_ISA_TYPE_GEN10 = 6
+    GEN_ISA_TYPE_GEN10 = 6,
+    GEN_ISA_TYPE_GEN11 = 7
 }   GEN_ISA_TYPE;
 
 typedef enum 

IGC/BiFModule/Implementation/IGCBiF_Intrinsics.cl

@@ -589,6 +589,10 @@ void __builtin_IB_media_block_write_ulong2(int image, int2 offset, int width, in
 void __builtin_IB_media_block_write_ulong4(int image, int2 offset, int width, int height, ulong4 pixels);
 void __builtin_IB_media_block_write_ulong8(int image, int2 offset, int width, int height, ulong8 pixels);
 
+int __builtin_IB_dp4a_ss(int c, int a, int b) __attribute__((const));
+int __builtin_IB_dp4a_uu(int c, int a, int b) __attribute__((const));
+int __builtin_IB_dp4a_su(int c, int a, int b) __attribute__((const));
+int __builtin_IB_dp4a_us(int c, int a, int b) __attribute__((const));
 
 short __builtin_IB_sub_group_reduce_OpGroupIAdd_i16(short x) __attribute__((const));
 short __builtin_IB_sub_group_reduce_OpGroupSMax_i16(short x) __attribute__((const));

IGC/Compiler/CISACodeGen/CISABuilder.cpp

@@ -2691,6 +2691,19 @@ TARGET_PLATFORM GetVISAPlatform(const CPlatform* platform)
         {
             return GENX_SKL;
         }
+    case IGFX_GEN10_CORE:
+        return GENX_CNL;
+    case IGFX_GEN11_CORE:
+        if (platform->getPlatformInfo().eProductFamily == IGFX_ICELAKE_LP ||
+            platform->getPlatformInfo().eProductFamily == IGFX_LAKEFIELD ||
+            platform->getPlatformInfo().eProductFamily == IGFX_JASPERLAKE)
+        {
+            return GENX_ICLLP;
+        }
+        else
+        {
+            return GENX_ICL;
+        }
     default:
         assert(0 && "unsupported platform");
         break;
@@ -2959,6 +2972,8 @@ void CEncoder::GenericAlu(e_opcode opcode, CVariable* dst, CVariable* src0, CVar
     case ISA_OR:
     case ISA_SHL:
     case ISA_SHR:
+    case ISA_ROL:
+    case ISA_ROR:
     case ISA_XOR:
         LogicOp(visaOpcode, dst, src0, src1, src2);
         break;
@@ -5148,8 +5163,8 @@ void CEncoder::SetVISAWaTable(WA_TABLE const& waTable)
     }
 
     if (m_program->m_Platform->supportFtrWddm2Svm() ||
-        m_program->m_Platform->GetPlatformFamily() == IGFX_GEN10_CORE
-        )
+        m_program->m_Platform->GetPlatformFamily() == IGFX_GEN10_CORE ||
+        m_program->m_Platform->GetPlatformFamily() == IGFX_GEN11_CORE)
     {
         // no send src/dst overlap when page fault is enabled
         m_WaTable.WaDisableSendSrcDstOverlap = true;

IGC/Compiler/CISACodeGen/CISABuilder.hpp

@@ -282,6 +282,7 @@ class CEncoder
     inline void IEEEDivide(CVariable* dst, CVariable* src0, CVariable* src1);
     void AddPair(CVariable *Lo, CVariable *Hi, CVariable *L0, CVariable *H0, CVariable *L1, CVariable *H1);
     void SubPair(CVariable *Lo, CVariable *Hi, CVariable *L0, CVariable *H0, CVariable *L1, CVariable *H1);
+    inline void dp4a(CVariable* dst, CVariable* src0, CVariable* src1, CVariable* src2);
     // VME
     void SendVmeIme(
         CVariable* bindingTableIndex,
@@ -784,6 +785,9 @@ inline void CEncoder::IEEEDivide(CVariable* dst, CVariable* src0, CVariable* src
     Arithmetic(ISA_DIVM, dst, src0, src1);
 }
 
+inline void CEncoder::dp4a(CVariable* dst, CVariable* src0, CVariable* src1, CVariable* src2) {
+    Arithmetic(ISA_DP4A, dst, src0, src1, src2);
+}
 
 inline void CEncoder::SetNoMask()
 {

IGC/Compiler/CISACodeGen/CMakeLists.txt

@@ -77,6 +77,7 @@ set(IGC_BUILD__SRC__CISACodeGen_Common
     "${CMAKE_CURRENT_SOURCE_DIR}/VertexShaderLowering.cpp"
     "${CMAKE_CURRENT_SOURCE_DIR}/WIAnalysis.cpp"
     "${CMAKE_CURRENT_SOURCE_DIR}/SLMConstProp.cpp"
+    "${CMAKE_CURRENT_SOURCE_DIR}/POSH_RemoveNonPositionOutput.cpp"
   )
 
 
@@ -161,6 +162,7 @@ set(IGC_BUILD__HDR__CISACodeGen_Common
     "${CMAKE_CURRENT_SOURCE_DIR}/VertexShaderLowering.hpp"
     "${CMAKE_CURRENT_SOURCE_DIR}/WIAnalysis.hpp"
     "${CMAKE_CURRENT_SOURCE_DIR}/SLMConstProp.hpp"
+    "${CMAKE_CURRENT_SOURCE_DIR}/POSH_RemoveNonPositionOutput.h"
   )
 
 

IGC/Compiler/CISACodeGen/EmitVISAPass.cpp

@@ -7238,6 +7238,12 @@ void EmitPass::EmitGenIntrinsicMessage(llvm::GenIntrinsicInst* inst)
     case GenISAIntrinsic::GenISA_GetPixelMask:
         emitGetPixelMask(inst);
         break;
+    case GenISAIntrinsic::GenISA_dp4a_ss:
+    case GenISAIntrinsic::GenISA_dp4a_uu:
+    case GenISAIntrinsic::GenISA_dp4a_su:
+    case GenISAIntrinsic::GenISA_dp4a_us:
+        emitDP4A(inst);
+        break;
     case GenISAIntrinsic::GenISA_evaluateSampler:
         // nothing to do
         break;
@@ -13910,4 +13916,29 @@ void EmitPass::emitWaveAll(llvm::GenIntrinsicInst* inst)
     emitReductionAll(opCode, identity, type, false, src, dst);
 }
 
+void EmitPass::emitDP4A(GenIntrinsicInst* GII) {
+    GenISAIntrinsic::ID GIID = GII->getIntrinsicID();
+    CVariable* dst = m_destination;
+    CVariable* src0 = GetSymbol(GII->getOperand(0));
+    CVariable* src1 = GetSymbol(GII->getOperand(1));
+    CVariable* src2 = GetSymbol(GII->getOperand(2));
+    // Set correct signedness of src1.
+    if (GIID == GenISAIntrinsic::GenISA_dp4a_ss ||
+        GIID == GenISAIntrinsic::GenISA_dp4a_su)
+        src1 = m_currShader->BitCast(src1, ISA_TYPE_D);
+    if (GIID == GenISAIntrinsic::GenISA_dp4a_uu ||
+        GIID == GenISAIntrinsic::GenISA_dp4a_us)
+        src1 = m_currShader->BitCast(src1, ISA_TYPE_UD);
+    // Set correct signedness of src2.
+    if (GIID == GenISAIntrinsic::GenISA_dp4a_ss ||
+        GIID == GenISAIntrinsic::GenISA_dp4a_us)
+        src2 = m_currShader->BitCast(src2, ISA_TYPE_D);
+    if (GIID == GenISAIntrinsic::GenISA_dp4a_uu ||
+        GIID == GenISAIntrinsic::GenISA_dp4a_su)
+        src2 = m_currShader->BitCast(src2, ISA_TYPE_UD);
+    // Emit dp4a.
+    m_encoder->dp4a(dst, src0, src1, src2);
+    m_encoder->Push();
+}
+
 

IGC/Compiler/CISACodeGen/EmitVISAPass.hpp

@@ -366,6 +366,7 @@ class EmitPass : public llvm::FunctionPass
     void emitRsq(llvm::Instruction *inst);
 
     void emitLLVMbswap(llvm::IntrinsicInst* inst);
+    void emitDP4A(llvm::GenIntrinsicInst *GII);
     // Debug Built-Ins
     void emitStateRegID(uint64_t and_imm, uint64_t shr_imm);
 

IGC/Compiler/CISACodeGen/POSH_RemoveNonPositionOutput.cpp

@@ -0,0 +1,113 @@
+/*===================== 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 "Compiler/IGCPassSupport.h"
+#include "common/LLVMWarningsPush.hpp"
+#include "llvm/IR/InstIterator.h"
+#include "common/LLVMWarningsPop.hpp"
+#include "GenISAIntrinsics/GenIntrinsicInst.h"
+#include "Compiler/CodeGenPublicEnums.h"
+#include "Compiler/CISACodeGen/helper.h"
+
+#include <llvm/IR/PassManager.h>
+
+using namespace IGC;
+using namespace llvm;
+
+class RemoveNonPositionOutput : public llvm::FunctionPass
+{
+public:
+    static char ID;
+
+    RemoveNonPositionOutput();
+
+    ~RemoveNonPositionOutput() {}
+
+    virtual void getAnalysisUsage(llvm::AnalysisUsage &AU) const override
+    {
+        AU.setPreservesCFG();
+    }
+
+    virtual bool runOnFunction(llvm::Function &F) override;
+
+    virtual llvm::StringRef getPassName() const override
+    {
+        return "remove non-position output in vertex shader";
+    }
+};
+
+llvm::FunctionPass* createRemoveNonPositionOutputPass()
+{
+    return new RemoveNonPositionOutput();
+}
+
+// Register pass to igc-opt
+#define PASS_FLAG_POSH "igc-remove-nonposition-output"
+#define PASS_DESCRIPTION_POSH "Custom Pass for Position-Only Shader"
+#define PASS_CFG_ONLY_POSH false
+#define PASS_ANALYSIS_POSH false
+IGC_INITIALIZE_PASS_BEGIN(RemoveNonPositionOutput, PASS_FLAG_POSH, PASS_DESCRIPTION_POSH, PASS_CFG_ONLY_POSH, PASS_ANALYSIS_POSH)
+IGC_INITIALIZE_PASS_END(RemoveNonPositionOutput, PASS_FLAG_POSH, PASS_DESCRIPTION_POSH, PASS_CFG_ONLY_POSH, PASS_ANALYSIS_POSH)
+
+char RemoveNonPositionOutput::ID = 0;
+
+RemoveNonPositionOutput::RemoveNonPositionOutput() : FunctionPass(ID)
+{
+    initializeRemoveNonPositionOutputPass(*PassRegistry::getPassRegistry());
+}
+
+bool RemoveNonPositionOutput::runOnFunction(Function &F)
+{
+    // Initialize the worklist to all of the instructions ready to process...
+    SmallVector<Instruction*, 10> instructionToRemove;
+    for (inst_iterator II = inst_begin(F), E = inst_end(F); II != E; ++II)
+    {
+        if (GenIntrinsicInst *inst = dyn_cast<GenIntrinsicInst>(&*II))
+        {
+            if (inst->getIntrinsicID() == GenISAIntrinsic::GenISA_OUTPUT)
+            {
+                const ShaderOutputType usage = static_cast<ShaderOutputType>(
+                    llvm::cast<llvm::ConstantInt>(inst->getOperand(4))->getZExtValue());
+                if (usage != SHADER_OUTPUT_TYPE_POSITION &&
+                    usage != SHADER_OUTPUT_TYPE_POINTWIDTH &&
+                    usage != SHADER_OUTPUT_TYPE_VIEWPORT_ARRAY_INDEX &&
+                    usage != SHADER_OUTPUT_TYPE_CLIPDISTANCE_LO &&
+                    usage != SHADER_OUTPUT_TYPE_CLIPDISTANCE_HI)
+                {
+                    instructionToRemove.push_back(inst);
+                }
+            }
+        }
+    }
+    bool changed = false;
+    uint num = instructionToRemove.size();
+    for (uint i = 0; i < num; ++i)
+    {
+        instructionToRemove[i]->eraseFromParent();
+        changed = true;
+    }
+    return changed;
+}

IGC/Compiler/CISACodeGen/POSH_RemoveNonPositionOutput.h

@@ -0,0 +1,29 @@
+/*===================== 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 ==================================*/
+
+#pragma once
+
+llvm::FunctionPass* createRemoveNonPositionOutputPass();