P4 to Git Change 1146222 by emankov@em-hsa-amd on 2015/04/30 10:04:18

ECR #333753 - Compiler Lib: 0_7 API removal 1) 0_7 API is totally removed from both legacy and non-legacy paths; 2) Bug 9641 - "tests on Compiler Lib (ocltst complib) should be refactored in order to use ACL API 0.8 instead of old 0.7" - fixed; 3) Side effect: pre-checkin testing cut down = 30% (from 14284 to 9918) => It looks like that we can add actually needed testing (for example, smoke on Win) instead of meaningless testing of the unused and abandoned API. Testing: pre-checkin Reviewers: Brian Sumner, Stanislav Mekhanoshin Affected files ... ... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/amdocl.def.in#12 edit ... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/amdocl.map.in#14 edit ... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/build/Makefile.api#110 edit ... //depot/stg/opencl/drivers/opencl/compiler/lib/amdoclcl.def.in#11 edit ... //depot/stg/opencl/drivers/opencl/compiler/lib/amdoclcl.map.in#10 edit ... //depot/stg/opencl/drivers/opencl/compiler/lib/api/Makefile#12 edit ... //depot/stg/opencl/drivers/opencl/compiler/lib/api/v0_7/Compilerbuiltin.cpp#2 delete ... //depot/stg/opencl/drivers/opencl/compiler/lib/api/v0_7/LLVMbuiltin.cpp#2 delete ... //depot/stg/opencl/drivers/opencl/compiler/lib/api/v0_7/Makefile#2 delete ... //depot/stg/opencl/drivers/opencl/compiler/lib/api/v0_7/SCbuiltin.cpp#2 delete ... //depot/stg/opencl/drivers/opencl/compiler/lib/api/v0_7/amdil.cpp#3 delete ... //depot/stg/opencl/drivers/opencl/compiler/lib/api/v0_7/build/Makefile#3 delete ... //depot/stg/opencl/drivers/opencl/compiler/lib/api/v0_7/build/Makefile.apiv07#11 delete ... //depot/stg/opencl/drivers/opencl/compiler/lib/api/v0_7/clCompiler.cpp#4 delete ... //depot/stg/opencl/drivers/opencl/compiler/lib/api/v0_7/gpuisa.cpp#3 delete ... //depot/stg/opencl/drivers/opencl/compiler/lib/api/v0_7/hsail.cpp#3 delete ... //depot/stg/opencl/drivers/opencl/compiler/lib/api/v0_7/llvm.cpp#3 delete ... //depot/stg/opencl/drivers/opencl/compiler/lib/api/v0_7/ocl.cpp#8 delete ... //depot/stg/opencl/drivers/opencl/compiler/lib/api/v0_7/rt.cpp#3 delete ... //depot/stg/opencl/drivers/opencl/compiler/lib/api/v0_7/x86.cpp#2 delete ... //depot/stg/opencl/drivers/opencl/compiler/lib/api/v0_8/acl.cpp#30 edit ... //depot/stg/opencl/drivers/opencl/compiler/lib/backends/common/library.hpp#13 edit ... //depot/stg/opencl/drivers/opencl/compiler/lib/build/Makefile.complib#81 edit ... //depot/stg/opencl/drivers/opencl/compiler/lib/include/v0_7/amdil.h#3 delete ... //depot/stg/opencl/drivers/opencl/compiler/lib/include/v0_7/api_defs.h#4 delete ... //depot/stg/opencl/drivers/opencl/compiler/lib/include/v0_7/clCompiler.h#3 delete ... //depot/stg/opencl/drivers/opencl/compiler/lib/include/v0_7/clTypes.h#3 delete ... //depot/stg/opencl/drivers/opencl/compiler/lib/include/v0_7/gpuisa.h#3 delete ... //depot/stg/opencl/drivers/opencl/compiler/lib/include/v0_7/hsail.h#3 delete ... //depot/stg/opencl/drivers/opencl/compiler/lib/include/v0_7/llvm.h#3 delete ... //depot/stg/opencl/drivers/opencl/compiler/lib/include/v0_7/ocl.h#3 delete ... //depot/stg/opencl/drivers/opencl/compiler/lib/include/v0_7/plugins/CompilerLoader.h#3 delete ... //depot/stg/opencl/drivers/opencl/compiler/lib/include/v0_7/plugins/LLVMLoader.h#3 delete ... //depot/stg/opencl/drivers/opencl/compiler/lib/include/v0_7/plugins/SCLoader.h#3 delete ... //depot/stg/opencl/drivers/opencl/compiler/lib/include/v0_7/plugins/interfaces/amdil.h#3 delete ... //depot/stg/opencl/drivers/opencl/compiler/lib/include/v0_7/plugins/interfaces/gpuisa.h#3 delete ... //depot/stg/opencl/drivers/opencl/compiler/lib/include/v0_7/plugins/interfaces/hsail.h#3 delete ... //depot/stg/opencl/drivers/opencl/compiler/lib/include/v0_7/plugins/interfaces/llvm.h#3 delete ... //depot/stg/opencl/drivers/opencl/compiler/lib/include/v0_7/plugins/interfaces/ocl.h#3 delete ... //depot/stg/opencl/drivers/opencl/compiler/lib/include/v0_7/plugins/interfaces/rt.h#3 delete ... //depot/stg/opencl/drivers/opencl/compiler/lib/include/v0_7/plugins/interfaces/x86.h#2 delete ... //depot/stg/opencl/drivers/opencl/compiler/lib/include/v0_7/rt.h#3 delete ... //depot/stg/opencl/drivers/opencl/compiler/lib/include/v0_7/x86.h#2 delete ... //depot/stg/opencl/drivers/opencl/compiler/lib/include/v0_8/aclDefs.h#4 edit ... //depot/stg/opencl/drivers/opencl/compiler/lib/include/v0_9/aclTypes.h#7 edit ... //depot/stg/opencl/drivers/opencl/compiler/lib/utils/v0_8/libUtils.cpp#7 edit ... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/binary/BIFBasic.cpp#12 edit ... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/binary/BIFEnumCheck.cpp#23 edit ... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/binary/BIFEnumCheck.hpp#7 edit ... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/binary/BIFIterator.cpp#2 edit ... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/complib/CLAssumptionCheck.cpp#42 edit ... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/complib/CLCompiler.cpp#11 edit ... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/complib/CLCompilerTst.h#5 edit ... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/complib/CLElf.cpp#11 delete ... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/complib/CLElf.h#6 delete ... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/complib/CLEnumCheck.cpp#43 edit ... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/complib/CLTargetInfo.cpp#28 delete ... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/complib/CLTargetInfo.h#4 delete ... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/complib/TestList.cpp#17 edit ... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/complib/aclAPI.cpp#19 edit ... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/complib/aclCompat.cpp#6 edit ... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/complib/build/Makefile.complib#34 edit ... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/complib/oclCompLayer.cpp#10 edit ... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/complib/oclCompLayer.h#3 edit ... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/complib/oclCompileBinary.cpp#11 delete ... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/complib/oclCompileBinary.h#6 delete ... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/complib/oclCompileCGToISA.cpp#10 delete ... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/complib/oclCompileCGToISA.h#5 delete ... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/complib/oclCompileIRToCG.cpp#9 delete ... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/complib/oclCompileIRToCG.h#4 delete ... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/complib/oclCompileSource.cpp#23 delete ... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/complib/oclCompileSource.h#7 delete ... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/complib/oclCompileSourceToIR.cpp#6 delete ... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/complib/oclCompileSourceToIR.h#4 delete ... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/complib/oclCompilerFini.cpp#9 delete ... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/complib/oclCompilerFini.h#5 delete ... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/complib/oclCompilerInit.cpp#9 delete ... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/complib/oclCompilerInit.h#5 delete ... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/complib/oclCompilerVersion.cpp#9 delete ... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/complib/oclCompilerVersion.h#5 delete ... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/complib/oclExtractSection.cpp#16 delete ... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/complib/oclExtractSection.h#8 delete ... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/complib/oclExtractSymbol.cpp#13 delete ... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/complib/oclExtractSymbol.h#6 delete ... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/complib/oclGetCompilerLog.cpp#15 delete ... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/complib/oclGetCompilerLog.h#7 delete ... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/complib/oclInsertSection.cpp#10 delete ... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/complib/oclInsertSection.h#7 delete ... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/complib/oclInsertSymbol.cpp#12 delete ... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/complib/oclInsertSymbol.h#6 delete ... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/complib/oclVersionSize.cpp#9 delete ... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/complib/oclVersionSize.h#5 delete ... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/complib/oclilCompileBinary.cpp#11 edit ... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/complib/oclilCompileBinary.h#8 edit ... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/complib/oclilCompileSource.cpp#18 edit ... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/complib/oclilCompileSource.h#7 edit ... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/complib/oclilConvertType.cpp#10 delete ... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/complib/oclilConvertType.h#7 delete ... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/complib/oclilRetrieveType.cpp#12 delete ... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/complib/oclilRetrieveType.h#7 delete ... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/complib/oclilSetType.cpp#14 delete ... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/complib/oclilSetType.h#7 delete ... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/complib/oclisaDisassemble.cpp#13 delete ... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/complib/oclisaDisassemble.h#7 delete ... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/complib/oclisaGetBinaryBlob.cpp#10 delete ... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/complib/oclisaGetBinaryBlob.h#7 delete ... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/complib/oclrtGetInfo.cpp#17 delete ... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/complib/oclrtGetInfo.h#3 delete [ROCm/clr commit: 9e45ef67cb]
2015-04-30 10:10:28 -04:00
@@ -38,53 +38,6 @@ aclConvertType
 aclDisassemble
 aclGetDeviceBinary
 aclInsertKernelStatistics
-oclCompilerInit
-oclCompilerFini
-oclCompilerVersion
-oclVersionSize
-oclCompileSource
-oclCompileSourceToIR
-oclCompileIRToIL
-oclCompileILToISA
-oclCompileBinary
-oclGetCompilerLog
-oclGetArchInfo
-oclGetFamilyInfo
-oclGetDeviceInfo
-oclGetAsicInfo
-oclGetTargetInfo
-oclGetArchitecture
-oclGetFamily
-oclGetChip
-oclGetAsic
-elfInsertSection
-elfExtractSection
-elfInsertSymbol
-elfExtractSymbol
-oclirSetType
-oclirRetrieveType
-oclirLink
-oclhsaCompileSource
-oclhsaCompileBinary
-oclhsaSetType
-oclhsaRetrieveType
-oclhsaConvertType
-oclilCompileSource
-oclilCompileBinary
-oclilSetType
-oclilRetrieveType
-oclilConvertType
-oclisaDisassemble
-oclisaGetBinaryBlob
-constructOclElf
-destructOclElf
-readOclElfFromFile
-readOclElfFromMem
-writeOclElfToFile
-writeOclElfToMem
-createElfFromElf
-getBIFVersion
-rtGetInfo
 aclDumpBinary
 aclJITObjectImageCreate
 aclJITObjectImageCopy
@@ -1,49 +1,5 @@
 ACL_API_0.8 {
 global:
-  oclCompilerInit;
-  oclCompilerFini;
-  oclCompilerVersion;
-  oclVersionSize;
-  oclCompileSource;
-  oclCompileSourceToIR;
-  oclCompileIRToIL;
-  oclCompileILToISA;
-  oclCompileBinary;
-  oclGetCompilerLog;
-  oclGetArchInfo;
-  oclGetDeviceInfo;
-  oclGetTargetInfo;
-  oclGetArchitecture;
-  oclGetFamily;
-  oclGetChip;
-  readOclElfFromFile;
-  readOclElfFromMem;
-  writeOclElfToFile;
-  writeOclElfToMem;
-  createElfFromElf;
-  getBIFVersion;
-  constructOclElf;
-  destructOclElf;
-  elfInsertSection;
-  elfExtractSection;
-  elfInsertSymbol;
-  elfExtractSymbol;
-  oclirSetType;
-  oclirRetrieveType;
-  oclirLink;
-  oclhsaCompileSource;
-  oclhsaCompileBinary;
-  oclhsaSetType;
-  oclhsaRetrieveType;
-  oclhsaConvertType;
-  oclilCompileSource;
-  oclilCompileBinary;
-  oclilSetType;
-  oclilRetrieveType;
-  oclilConvertType;
-  oclisaDisassemble;
-  oclisaGetBinaryBlob;
-  rtGetInfo;
  aclCompilerInit;
  aclCompilerFini;
  aclCompilerVersion;
@@ -9,7 +9,7 @@
 #include <string>
 namespace amd {

-typedef enum _library_selector_0_7 {
+typedef enum _library_selector {
    LibraryUndefined = 0,
    GPU_Library_7xx,
    GPU_Library_Evergreen,
@@ -16,10 +16,6 @@
 #define ACL_API_0_8
 #endif

-#ifndef AOC_API_0_7
-#define AOC_API_0_7
-#endif
-
 #ifndef BIF_API_2_0
 #define BIF_API_2_0
 #endif
@@ -4,8 +4,6 @@
 #include "acl.h"
 #include "aclTypes.h"
 #include "api/v0_8/aclValidation.h"
-#include "v0_7/clTypes.h"
-#include "v0_7/clCompiler.h"
 #include "libUtils.h"
 #include "bif/bifbase.hpp"
 #include "utils/target_mappings.h"
@@ -635,18 +633,14 @@ cloneOclElfNoBIF(const aclBinary *src) {
    aclBinary_0_8_1 *dptr = reinterpret_cast<aclBinary_0_8_1*>(dst);
    const aclBinary_0_8_1 *sptr = reinterpret_cast<const aclBinary_0_8_1*>(src);
    dptr->target.struct_size = sizeof(aclTargetInfo_0_8);
-    if (sptr->target.struct_size == sizeof(oclTargetInfo_0_7)) {
-      dptr->target.arch_id = sptr->target.arch_id;
-      dptr->target.chip_id = sptr->target.chip_id;
-    } else if (sptr->target.struct_size == sizeof(aclTargetInfo_0_8)) {
+    if (sptr->target.struct_size == sizeof(aclTargetInfo_0_8)) {
      memcpy(&dptr->target, &sptr->target, sptr->target.struct_size);
    } else {
      assert(!"Unsupported target info detected!");
    }

    memcpy(&dptr->caps, &sptr->caps, sptr->caps.struct_size);
-    assert(sizeof(aclDevCaps_0_8) == dptr->caps.struct_size
-        && "The caps struct is not version 0.7!");
+    assert(sizeof(aclDevCaps_0_8) == dptr->caps.struct_size);
    amd::option::Options *Opts = reinterpret_cast<amd::option::Options*>(
            aclutAlloc(src)(sizeof(amd::option::Options)));
    Opts = new (Opts) amd::option::Options;
@@ -668,10 +662,7 @@ cloneOclElfNoBIF(const aclBinary *src) {
    aclBinary_0_8 *dptr = reinterpret_cast<aclBinary_0_8*>(dst);
    const aclBinary_0_8 *sptr = reinterpret_cast<const aclBinary_0_8*>(src);
    dptr->target.struct_size = sizeof(aclTargetInfo_0_8);
-    if (sptr->target.struct_size == sizeof(oclTargetInfo_0_7)) {
-      dptr->target.arch_id = sptr->target.arch_id;
-      dptr->target.chip_id = sptr->target.chip_id;
-    } else if (sptr->target.struct_size == sizeof(aclTargetInfo_0_8)) {
+    if (sptr->target.struct_size == sizeof(aclTargetInfo_0_8)) {
      memcpy(&dptr->target, &sptr->target, sptr->target.struct_size);
    } else {
      assert(!"Unsupported target info detected!");
@@ -691,29 +682,6 @@ cloneOclElfNoBIF(const aclBinary *src) {
    dptr->options = reinterpret_cast<aclOptions*>(Opts);
    dptr->bin = NULL;
    return dst;
-  } else if (src->struct_size == sizeof(oclElfHandle_0_7)) {
-    oclElf *dst = constructOclElf(src->struct_size);
-    if (dst == NULL) {
-      return NULL;
-    }
-    oclElfHandle_0_7 *dptr = reinterpret_cast<oclElfHandle_0_7*>(dst);
-    const oclElfHandle_0_7 *sptr = reinterpret_cast<const oclElfHandle_0_7*>(src);
-    dptr->target.struct_size = sptr->target.struct_size;
-    memcpy(&dptr->target, &sptr->target, sptr->target.struct_size);
-    assert(sizeof(oclTargetInfo_0_7) == dptr->target.struct_size
-        && "The target info struct is not version 0.7!");
-    memcpy(&dptr->caps, &sptr->caps, sptr->caps.struct_size);
-    assert(sizeof(elfDevCaps_0_7) == dptr->caps.struct_size
-        && "The caps struct is not version 0.7!");
-    amd::option::Options *Opts = reinterpret_cast<amd::option::Options*>(
-            aclutAlloc(src)(sizeof(amd::option::Options)));
-    Opts = new (Opts) amd::option::Options;
-    amd::option::Options *sOpts = reinterpret_cast<amd::option::Options*>(
-        sptr->options);
-    parseAllOptions(sOpts->origOptionStr, *Opts);
-    dptr->options = reinterpret_cast<bifOptions*>(Opts);
-    dptr->bin = NULL;
-    return reinterpret_cast<aclBinary*>(dst);
  } else {
    assert(!"Elf version not supported!");
  }