remove depreaceted code

Change-Id: I9926391c5864acfe1b3958934c2ba48e56aeb25a

Author: aparshin-intel

IGC/AdaptorOCL/CMakeLists.txt

@@ -106,7 +106,6 @@ set(IGC_BUILD__HDR__AdaptorOCL
     "${CMAKE_CURRENT_SOURCE_DIR}/OCL/CommandStream/SamplerTypes.h"
     "${CMAKE_CURRENT_SOURCE_DIR}/OCL/CommandStream/SurfaceTypes.h"
     "${CMAKE_CURRENT_SOURCE_DIR}/DriverInfoOCL.hpp"
-    "${CMAKE_CURRENT_SOURCE_DIR}/igcmc.h"
     "${CMAKE_CURRENT_SOURCE_DIR}/cmc.h"
     "${CMAKE_CURRENT_SOURCE_DIR}/UnifyIROCL.hpp"
     "${CMAKE_CURRENT_SOURCE_DIR}/MoveStaticAllocas.h"

IGC/AdaptorOCL/cmc.h

@@ -33,12 +33,130 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <llvm/Support/DynamicLibrary.h>
 #include "common/LLVMWarningsPop.hpp"
 
-#include "igcmc.h"
 #include "Compiler/CodeGenPublic.h"
 #include "common/LLVMWarningsPush.hpp"
 #include "VectorCompiler/include/vc/GenXCodeGen/GenXWrapper.h"
 #include "common/LLVMWarningsPop.hpp"
 
+// optional resource access kind
+enum class cmc_access_kind : int32_t {
+    undef,
+    read_only,
+    write_only,
+    read_write
+};
+
+enum class cmc_arg_kind : int32_t {
+    General,
+    LocalSize,  // IMPLICIT_LOCAL_SIZE
+    GroupCount, // IMPLICIT_NUM_GROUPS
+    Buffer,     // 1D buffer
+    SVM,        // stateless global pointer
+    Sampler,
+    Image1d,
+    Image2d,
+    Image3d,
+    PrintBuffer,
+    PrivateBase
+};
+
+struct cmc_ocl_print_string {
+    static constexpr unsigned max_width = 256;
+    char s[max_width];
+};
+
+struct cmc_arg_info {
+    // The argument kind.
+    cmc_arg_kind kind = cmc_arg_kind::General;
+
+    // The argument index in this kernel.
+    int32_t index = 0;
+
+    // the byte offset of this argument in payload
+    int32_t offset = 0;
+
+    // The byte size of this argument in payload
+    int32_t sizeInBytes = 0;
+
+    // The BTI for this resource, if applicable.
+    int32_t BTI = 0;
+
+    // the optional resource access kind, if applicable.
+    cmc_access_kind access = cmc_access_kind::undef;
+};
+
+// compilation interface bewteen cmc and igc
+struct cmc_kernel_info_v2 {
+    /// The kernel name.
+    const char *name;
+
+    /// The number of kernel arguments
+    unsigned num_args;
+
+    /// The kernel argument info.
+    cmc_arg_info *arg_descs;
+
+    // ThreadPayload
+    bool HasLocalIDx = false;
+    bool HasLocalIDy = false;
+    bool HasLocalIDz = false;
+    bool HasGroupID = false;
+
+    // ExecutionEnivronment
+    uint32_t CompiledSIMDSize = 8;
+    uint32_t SLMSize = 0;
+    uint32_t NumGRFRequired = 128;
+    uint32_t GRFByteSize = 32;
+    uint32_t HasBarriers = 0;
+    bool HasReadWriteImages = false;
+    uint32_t ThreadPrivateMemSize = 0;
+    uint32_t StatelessPrivateMemSize = 0;
+
+    /// number of format strings in the kernel
+    unsigned num_print_strings = 0;
+    /// The kernel format string storage
+    cmc_ocl_print_string *print_string_descs = nullptr;
+
+    struct TableInfo {
+        void *Buf = nullptr;
+        uint32_t Size = 0;
+        uint32_t NumEntries = 0;
+    };
+
+    TableInfo RelocationTable;
+    TableInfo SymbolTable;
+    vc::ocl::ZEBinaryInfo ZEBinInfo;
+};
+
+struct cmc_compile_info_v2 {
+    /// The vISA binary size in bytes.
+    uint64_t binary_size;
+
+    /// The vISA binary data.
+    void* binary;
+
+    uint32_t pointer_size_in_bytes;
+
+    /// The vISA major version.
+    uint32_t visa_major_version;
+
+    /// The vISA minor version.
+    uint32_t visa_minor_version;
+
+    /// The number of kernel.
+    unsigned num_kernels;
+
+    /// Ugly stub for compatibility with cmc
+    void *compatibility_stub;
+
+    /// The context for this compilation. This opaque data holds all memory
+    /// allocations that will be freed in the end.
+    void* context;
+
+    /// The kernel infomation.
+    cmc_kernel_info_v2 *kernel_info_v2;
+};
+
 namespace iOpenCL {
   class CGen8CMProgram;
 }

IGC/AdaptorOCL/dllInterfaceCompute.cpp

@@ -53,7 +53,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "usc.h"
 
 #include "AdaptorOCL/OCL/sp/gtpin_igc_ocl.h"
-#include "AdaptorOCL/igcmc.h"
 #include "AdaptorOCL/cmc.h"
 #include "common/LLVMWarningsPush.hpp"
 #include <llvm/ADT/ScopeExit.h>

IGC/AdaptorOCL/igcmc.h

@@ -80,7 +80,6 @@ set(IGC_BUILD__HDR__DriverInterface
     "${CMAKE_CURRENT_SOURCE_DIR}/../AdaptorOCL/OCL/sp/zebin_builder.hpp"
     "${CMAKE_CURRENT_SOURCE_DIR}/../AdaptorOCL/MoveStaticAllocas.h"
     "${CMAKE_CURRENT_SOURCE_DIR}/../AdaptorOCL/cmc.h"
-    "${CMAKE_CURRENT_SOURCE_DIR}/../AdaptorOCL/igcmc.h"
 
     "${IGC_BUILD__COMMON_COMPILER_DIR}/API/ErrorCode.h"
     "${IGC_BUILD__COMMON_COMPILER_DIR}/API/SurfaceFormats.h"