Internal feature

Change-Id: Ic188cb232524a750158e822a82f4a180c8eff347

Author: trbauer

visa/iga/GEDLibrary/GED_external/CMakeLists.txt

@@ -1,18 +1,18 @@
 # GEDLibrary/GED
 if(WIN32)
-cmake_minimum_required(VERSION 3.1)
+    cmake_minimum_required(VERSION 3.1)
 else()
-cmake_minimum_required(VERSION 2.8)
+    cmake_minimum_required(VERSION 2.8)
 endif(WIN32)
 
 project(GEDLibrary)
 
 if (CMAKE_SIZEOF_VOID_P EQUAL 4)
-  set(PLATFORM_TARGET ia32)
-  set(GED_TARGET TARGET_IA32)
+    set(PLATFORM_TARGET ia32)
+    set(GED_TARGET TARGET_IA32)
 else()
-  set(PLATFORM_TARGET intel64)
-  set(GED_TARGET TARGET_INTEL64)
+    set(PLATFORM_TARGET intel64)
+    set(GED_TARGET TARGET_INTEL64)
 endif()
 
 
@@ -23,24 +23,21 @@ add_subdirectory(build/autogen-${PLATFORM_TARGET})
 
 # Set up windows mobile build flags to use dynamic multi-threaded runtime (/MD)
 # Set up windows(other) build flags to use static multi-threaded runtime (/MT)
-if( WIN32 AND ("${BUILD_WINDOWS_MOBILE}" STREQUAL "TRUE") OR (IGC_OPTION__WINDOWS_MOBILE AND LINK_DLL_IGA) )
-      win_dynamic_runtime()
+if( WIN32 AND ("${BUILD_WINDOWS_MOBILE}" STREQUAL "TRUE") OR (IGC_OPTION__WINDOWS_MOBILE AND LINK_DLL_IGA))
+    win_dynamic_runtime()
 else(WIN32 AND ("${BUILD_WINDOWS_MOBILE}" STREQUAL "TRUE") OR (IGC_OPTION__WINDOWS_MOBILE AND LINK_DLL_IGA))
-win_static_runtime()
+    win_static_runtime()
 endif(WIN32 AND ("${BUILD_WINDOWS_MOBILE}" STREQUAL "TRUE") OR (IGC_OPTION__WINDOWS_MOBILE AND LINK_DLL_IGA))
 
 set(GED_files
-  ${GED_xcoder_cpp}
-  ${GED_xcoder_h}
-  ${GED_common_cpp}
-  ${GED_common_h}
-  ${GED_autogen${PLATFORM_TARGET}_cpp}
-  ${GED_autogen${PLATFORM_TARGET}_h})
+    ${GED_xcoder_cpp}
+    ${GED_xcoder_h}
+    ${GED_common_cpp}
+    ${GED_common_h}
+    ${GED_autogen${PLATFORM_TARGET}_cpp}
+    ${GED_autogen${PLATFORM_TARGET}_h})
 
 include_directories(Source/ged Source/common Source "build/autogen-${PLATFORM_TARGET}")
-if (NOT IGC_BUILD)
-    set(GED_validation_api GED_VALIDATION_API)
-endif()
 
 set(GED_definitions_hide_enums
     GED_MODELS_ARRAY_NAMES_HIDDEN
@@ -61,7 +58,6 @@ set(GED_definitions_hide_enums
     GED_DEP_CTRL_HIDDEN
     GED_DST_CHAN_EN_HIDDEN
     GED_EOT_HIDDEN
-    GED_EVICT_HINT_HIDDEN
     GED_EXEC_MASK_OFFSET_CTRL_HIDDEN
     GED_EXECUTION_DATA_TYPE_HIDDEN
     GED_FUSION_CTRL_HIDDEN
@@ -81,7 +77,6 @@ set(GED_definitions_hide_enums
     GED_RETURN_DATA_CONTROL_HIDDEN
     GED_SATURATE_HIDDEN
     GED_SFID_HIDDEN
-    GED_SHFL_FC_HIDDEN
     GED_SIMDMODE_HIDDEN
     GED_SLOT_GROUP_HIDDEN
     GED_SRC_MOD_HIDDEN
@@ -90,45 +85,45 @@ set(GED_definitions_hide_enums
     GED_SUB_FUNC_ID_HIDDEN
     GED_SWIZZLE_HIDDEN
     GED_SYNC_FC_HIDDEN
-    GED_TERNARY_EVICT_HINT_HIDDEN
-    GED_TERNARY_STORE_HINT_HIDDEN
     GED_THREAD_CTRL_HIDDEN)
-set(GED_definitions_debug _CONSOLE _LIB ${GED_TARGET} GED_DISASSEMBLY GED_DEBUG ${GED_validation_api} ${GED_definitions_hide_enums})
-set(GED_definitions _CONSOLE _LIB ${GED_TARGET} GED_DISASSEMBLY ${GED_validation_api} ${GED_definitions_hide_enums})
 
-#Needs to be before add_library otherwise it doesn't get set.
+
+set(GED_definitions_debug _CONSOLE _LIB ${GED_TARGET} GED_DISASSEMBLY ${GED_definitions_hide_enums} GED_DEBUG)
+set(GED_definitions       _CONSOLE _LIB ${GED_TARGET} GED_DISASSEMBLY ${GED_definitions_hide_enums})
+
+# Needs to be before add_library otherwise it doesn't get set.
 if(MSVC)
-        add_compile_options($<$<CONFIG:Release>:/Ox> /Gy)
+    add_compile_options($<$<CONFIG:Release>:/Ox> /Gy)
 endif(MSVC)
 
 if (MSVC)
-  set(IGA_LINK_FLAGS "/OPT:REF /OPT:ICF /LTCG /INCREMENTAL:NO")
+    set(IGA_LINK_FLAGS "/OPT:REF /OPT:ICF /LTCG /INCREMENTAL:NO")
 else(MSVC)
-  set(IGA_LINK_FLAGS "")
+    set(IGA_LINK_FLAGS "")
 endif(MSVC)
 
 add_library(GEDLibrary OBJECT ${GED_files})
 
-set_property( TARGET GEDLibrary APPEND PROPERTY
+set_property(TARGET GEDLibrary APPEND PROPERTY
     OUTPUT_NAME                                "ged${TARGET_MODIFIER}"
   )
-set_property( TARGET GEDLibrary APPEND PROPERTY
+set_property(TARGET GEDLibrary APPEND PROPERTY
     COMPILE_DEFINITIONS                        ${GED_definitions}
   )
-set_property( TARGET GEDLibrary APPEND PROPERTY
+set_property(TARGET GEDLibrary APPEND PROPERTY
     COMPILE_DEFINITIONS                        $<$<CONFIG:Debug>:GED_DEBUG>
   )
 
 # Hidden visibility suppresses PLT entries from being created for GED and
 # functions and trims the interface down to a minimal size
 # This was manifested when IGA was used in GT-PIN which also uses GED.
 # IGA ended up using GED library linked with GT-PIN not IGA one
-#https://gcc.gnu.org/wiki/Visibility
+# https://gcc.gnu.org/wiki/Visibility
 set(CMAKE_CXX_VISIBILITY_PRESET hidden)
 
 if(NOT WIN32)
-  set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden"  )
-  set_target_properties( GEDLibrary PROPERTIES PREFIX "")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden")
+    set_target_properties(GEDLibrary PROPERTIES PREFIX "")
 endif()
 
 source_group("SourceFiles/xcoder" FILES ${GED_xcoder_cpp})
@@ -140,8 +135,8 @@ source_group("HeaderFiles/auto${PLATFORM_TARGET}" FILES ${GED_autogen${PLATFORM_
 
 # target_include_directories(GEDLibrary PRIVATE include)
 if(ANDROID AND MEDIA_IGA)
-  set(NDK_Libstdcxx $ENV{ANDROID_NDK}/sources/cxx-stl/llvm-libc++/libcxx)
-  set(Extra_Android_Inc ${NDK_Libstdcxx}/include ${ANDROID_NDK}/sources/android/support/include
+    set(NDK_Libstdcxx $ENV{ANDROID_NDK}/sources/cxx-stl/llvm-libc++/libcxx)
+    set(Extra_Android_Inc ${NDK_Libstdcxx}/include ${ANDROID_NDK}/sources/android/support/include
     ${NDK_Libstdcxx}/include/backward)
-  include_directories(${Extra_Android_Inc})
+    include_directories(${Extra_Android_Inc})
 endif(ANDROID AND MEDIA_IGA)

visa/iga/GEDLibrary/GED_external/build/autogen-ia32/ged_ins_field.cpp

@@ -126,6 +126,8 @@ GED_FIELD_TYPE fieldTypesByField[116] =
     0x100, // 114
     0x100 // 115
 }; // fieldTypesByField[]
+
+#if GED_VALIDATION_API
 const char* fieldNameByField[116] =
 {
     "Opcode", // 0
@@ -245,6 +247,7 @@ const char* fieldNameByField[116] =
     "DataTypeIndexNoDep", // 114
     "CompactedImm" // 115
 }; // fieldNameByField[]
+#endif // GED_VALIDATION_API
 GED_FIELD_TYPE pseudoFieldTypesByField[36] =
 {
     0x103, // 0
@@ -284,6 +287,8 @@ GED_FIELD_TYPE pseudoFieldTypesByField[36] =
     0x103, // 34
     0x100 // 35
 }; // pseudoFieldTypesByField[]
+
+#if GED_VALIDATION_API
 const char* fieldNameByPseudoField[36] =
 {
     "ArchReg", // 0
@@ -323,3 +328,4 @@ const char* fieldNameByPseudoField[36] =
     "MessageTypeDP_DCRO", // 34
     "ExMessageLength" // 35
 }; // fieldNameByPseudoField[]
+#endif // GED_VALIDATION_API

visa/iga/GEDLibrary/GED_external/build/autogen-ia32/version.cpp

@@ -1 +1 @@
-const char* gedVersion = "VERSION=dev (5d0e7cb)";
+const char* gedVersion = "VERSION=GED0.71 (4d64f1b)";

visa/iga/GEDLibrary/GED_external/build/autogen-intel64/ged_ins_field.cpp

@@ -126,6 +126,8 @@ GED_FIELD_TYPE fieldTypesByField[116] =
     0x100, // 114
     0x100 // 115
 }; // fieldTypesByField[]
+
+#if GED_VALIDATION_API
 const char* fieldNameByField[116] =
 {
     "Opcode", // 0
@@ -245,6 +247,7 @@ const char* fieldNameByField[116] =
     "DataTypeIndexNoDep", // 114
     "CompactedImm" // 115
 }; // fieldNameByField[]
+#endif // GED_VALIDATION_API
 GED_FIELD_TYPE pseudoFieldTypesByField[36] =
 {
     0x103, // 0
@@ -284,6 +287,8 @@ GED_FIELD_TYPE pseudoFieldTypesByField[36] =
     0x103, // 34
     0x100 // 35
 }; // pseudoFieldTypesByField[]
+
+#if GED_VALIDATION_API
 const char* fieldNameByPseudoField[36] =
 {
     "ArchReg", // 0
@@ -323,3 +328,4 @@ const char* fieldNameByPseudoField[36] =
     "MessageTypeDP_DCRO", // 34
     "ExMessageLength" // 35
 }; // fieldNameByPseudoField[]
+#endif // GED_VALIDATION_API

visa/iga/GEDLibrary/GED_external/build/autogen-intel64/version.cpp

@@ -1 +1 @@
-const char* gedVersion = "VERSION=dev (5d0e7cb)";
+const char* gedVersion = "VERSION=GED0.71 (4d64f1b)";

visa/iga/IGALibrary/Backend/GED/Decoder.cpp

@@ -27,6 +27,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "IGAToGEDTranslation.hpp"
 #include "GEDToIGATranslation.hpp"
 #include "../../asserts.hpp"
+#include "../../strings.hpp"
 #include "../../Frontend/Formatter.hpp"
 #include "../../Frontend/IRToString.hpp"
 #include "../../IR/Checker/IRChecker.hpp"
@@ -37,6 +38,8 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <sstream>
 #include <cstring>
 
+
+
 // Used to label expressions that need to be removed once GED is fixed
 #define GED_WORKAROUND(X) (X)
 

visa/iga/IGALibrary/Backend/GED/Decoder.hpp

@@ -30,53 +30,55 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "GEDToIGATranslation.hpp"
 #include "ged.h"
 
+#ifdef GED_PRINT_BIT_LOCATION
+#undef GED_PRINT_BIT_LOCATION
+#endif
+#if GED_VALIDATION_API
+#define GED_PRINT_BIT_LOCATION(FIELD) \
+    do { \
+        std::cout << "FIELD: " << #FIELD << "\n"; \
+        GED_PrintFieldBitLocation(&m_currGedInst, GED_INS_FIELD_ ## FIELD); \
+    } while(0)
+#else
+#define GED_PRINT_BIT_LOCATION(FIELD)
+#endif
 
 #define GED_DECODE_TO(FIELD, TRANS, DST) \
     do { \
-      GED_RETURN_VALUE _status; \
-      if (print_ged_debug) { \
-          std::cout << "FIELD: " << #FIELD << std::endl; \
-          GED_PrintFieldBitLocation(&m_currGedInst, GED_INS_FIELD_ ## FIELD); \
-      } \
-      DST = TRANS(GED_Get ## FIELD(&m_currGedInst, &_status)); \
-      if (_status != GED_RETURN_VALUE_SUCCESS) { \
-          handleGedDecoderError(__LINE__, #FIELD, _status); \
-      } \
+        GED_RETURN_VALUE _status; \
+        GED_PRINT_BIT_LOCATION(FIELD); \
+        DST = TRANS(GED_Get ## FIELD(&m_currGedInst, &_status)); \
+        if (_status != GED_RETURN_VALUE_SUCCESS) { \
+            handleGedDecoderError(__LINE__, #FIELD, _status); \
+        } \
     } while (0)
 
 #define GED_DECODE_RAW_TO(FIELD, DST) \
     do { \
-      GED_RETURN_VALUE _status; \
-      if (print_ged_debug) { \
-          std::cout << "FIELD: " << #FIELD << std::endl; \
-          GED_PrintFieldBitLocation(&m_currGedInst, GED_INS_FIELD_ ## FIELD); \
-      } \
-      DST = GED_Get ## FIELD(&m_currGedInst, &_status); \
-      if (_status != GED_RETURN_VALUE_SUCCESS) { \
-          handleGedDecoderError(__LINE__, #FIELD, _status); \
-      } \
+        GED_RETURN_VALUE _status; \
+        GED_PRINT_BIT_LOCATION(FIELD); \
+        DST = GED_Get ## FIELD(&m_currGedInst, &_status); \
+        if (_status != GED_RETURN_VALUE_SUCCESS) { \
+            handleGedDecoderError(__LINE__, #FIELD, _status); \
+        } \
     } while (0)
 
 #define GED_DECODE_RAW(GED_TYPE, ID, FIELD) \
-        GED_TYPE ID; \
-        GED_DECODE_RAW_TO(FIELD, ID);
+    GED_TYPE ID; \
+    GED_DECODE_RAW_TO(FIELD, ID);
 
 #define GED_DECODE(IGA_TYPE, GED_TYPE, ID, FIELD) \
-        GED_DECODE_RAW(GED_TYPE, GED_ ## ID, FIELD); \
-        IGA_TYPE ID = translate(GED_ ## ID);
-
+    GED_DECODE_RAW(GED_TYPE, GED_ ## ID, FIELD); \
+    IGA_TYPE ID = translate(GED_ ## ID);
 
 #define GED_DECODE_RAW_TO_SRC(DST, TYPE, FIELD) \
     do { \
-      GED_RETURN_VALUE _STATUS; \
-      if (print_ged_debug) { \
-          std::cout << "FIELD: " << #FIELD << std::endl; \
-          GED_PrintFieldBitLocation(&m_currGedInst, GED_INS_FIELD_ ## FIELD); \
-      } \
-      DST = GED_Get ## FIELD(&m_currGedInst, &_STATUS); \
-      if (_STATUS != GED_RETURN_VALUE_SUCCESS) { \
-          handleGedDecoderError(__LINE__, #FIELD, _STATUS); \
-      } \
+        GED_RETURN_VALUE _STATUS; \
+        GED_PRINT_BIT_LOCATION(FIELD); \
+        DST = GED_Get ## FIELD(&m_currGedInst, &_STATUS); \
+        if (_STATUS != GED_RETURN_VALUE_SUCCESS) { \
+            handleGedDecoderError(__LINE__, #FIELD, _STATUS); \
+        } \
     } while (0)
 
 #define RETURN_GED_DECODE_RAW_TO_SRC(TYPE, FIELD) { \
@@ -406,18 +408,6 @@ namespace iga
         void decodeChSelToSwizzle(uint32_t chanSel, GED_SWIZZLE swizzle[4]);
         template <SourceIndex S> bool isChanSelPacked();
 
-#if GED_VALIDATION_API
-        static const bool print_ged_debug = true;
-#else
-        static const bool print_ged_debug = false;
-        static GED_RETURN_VALUE GED_PrintFieldBitLocation(
-            const ged_ins_t*,
-            const GED_INS_FIELD)
-        {
-            return GED_RETURN_VALUE_SUCCESS;
-        };
-#endif
-
         void decodeOptions(Instruction *inst);
 
         // Translate Sub register from binary encoding number to asm number

visa/iga/IGALibrary/Backend/GED/Encoder.cpp

@@ -23,13 +23,15 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 
 ======================= end_copyright_notice ==================================*/
-#include "IGAToGEDTranslation.hpp"
 #include "Encoder.hpp"
-#include "../../IR/Kernel.hpp"
+#include "IGAToGEDTranslation.hpp"
+#include "../../strings.hpp"
 #include "../../Frontend/IRToString.hpp"
+#include "../../IR/Kernel.hpp"
+#include "../../IR/SWSBSetter.hpp"
 #include "../../Models/Models.hpp"
 #include "../../Timer/Timer.hpp"
-#include "../../IR/SWSBSetter.hpp"
+
 #include <cstring>
 
 using namespace iga;
@@ -45,6 +47,7 @@ using namespace iga;
 // InstructionEncoder
 
 
+
 static const char *gedReturnValueToString(GED_RETURN_VALUE rv)
 {
     switch(rv) {
@@ -184,8 +187,7 @@ void Encoder::encodeBlock(Block *blk)
 
         GED_RETURN_VALUE status = GED_RETURN_VALUE_SIZE;
         bool mustCompact = inst->hasInstOpt(InstOpt::COMPACTED);
-        bool mustNotCompact =
-            inst->hasInstOpt(InstOpt::NOCOMPACT);
+        bool mustNotCompact = inst->hasInstOpt(InstOpt::NOCOMPACT);
         int32_t iLen = 16;
         if (mustCompact || (!mustNotCompact && m_opts.autoCompact)) {
             // try compact first
@@ -205,7 +207,7 @@ void Encoder::encodeBlock(Block *blk)
             } // else: some other error (unreachable?)
         }
 
-        // try native encoding
+        // try native encoding if compaction failed
         if (status != GED_RETURN_VALUE_SUCCESS) {
             inst->removeInstOpt(InstOpt::COMPACTED);
             status = GED_EncodeIns(&m_gedInst, GED_INS_TYPE_NATIVE, m_instBuf + currentPc());