Adding Android feature

Adding Android feature.

Author: jhananit

IGC/AdaptorOCL/ocl_igc_interface/impl/fcl_ocl_translation_ctx_impl.cpp

@@ -40,6 +40,9 @@ SPDX-License-Identifier: MIT
 #include <iostream>
 #include <string>
 #include <vector>
+#if defined(__ANDROID__)
+#include <sstream>
+#endif
 
 #if defined( _DEBUG ) || defined( _INTERNAL )
 #include <numeric>

IGC/CMakeLists.txt

@@ -1711,6 +1711,11 @@ list(APPEND _targetLinkLineCommon zebinlib)
         "${CMAKE_DL_LIBS}"
       )
     endif()
+    # Android binary needs to link static libstdc++ and liblog
+    if(ANDROID)
+        find_package(Threads REQUIRED)
+        target_link_libraries("${IGC_BUILD__PROJ${_libBuildSuffix}}" PRIVATE Threads::Threads -static-libstdc++ -llog)
+    endif()
     # Link line for shared / dynamic library requires only library project (all static libs are linked inside).
     set_property(TARGET "${IGC_BUILD__PROJ${_libBuildSuffix}}" PROPERTY LINK_INTERFACE_LIBRARIES "")
     set("IGC_BUILD__LINK_LINE${_libBuildSuffix}"

IGC/Compiler/CISACodeGen/ShaderCodeGen.cpp

@@ -1533,7 +1533,7 @@ void OptimizeIR(CodeGenContext* const pContext)
         });
 
         mpm.add(new TargetTransformInfoWrapperPass(GenTTgetIIRAnalysis));
-#if defined(_DEBUG) && !defined(ANDROID)
+#if defined(_DEBUG) && !defined(__ANDROID__)
         // IGC IR Verification pass checks that we get a correct IR after the Unification.
         mpm.add(new VerificationPass());
 #endif

visa/BinaryEncodingCNL.h

@@ -28,7 +28,9 @@ typedef uint64_t QWORD;
 #define BITFIELD_RANGE(startbit, endbit)     ((endbit)-(startbit)+1)
 #define BITFIELD_BIT(bit)                   1
 
+#if !defined(__ANDROID__)
 #define __CONCAT(x,y)   x ## y
+#endif
 #define __UNIQUENAME(a1, a2)  __CONCAT(a1, a2)
 #define UNIQUENAME(__text)    __UNIQUENAME(__text, __COUNTER__)
 #define STATIC_ASSERT(e)  typedef char UNIQUENAME(STATIC_ASSERT_)[(e)?1:-1]

visa/iga/IGALibrary/IR/DUAnalysis.cpp

@@ -1033,8 +1033,16 @@ struct DepAnalysisComputer
 
     static bool updateLiveDefs(LivePaths &to, const LivePaths &from) {
         bool changed = from != to;
-        if (changed)
-            to = from;
+        if (changed) {
+#if defined(__ANDROID__)
+       to.clear();
+       for (auto iter : from) {
+              to.insert(iter);
+       }
+#else
+       to = from;
+#endif
+    }
         return changed;
     }