No material for open source

Change-Id: I3f3b873b2de188922b9907714a280033f179c75a

Author: juanrod2

IGC/Compiler/CISACodeGen/GenCodeGenModule.cpp

@@ -513,11 +513,6 @@ bool GenXFunctionGroupAnalysis::verify()
                 Function *F = *FI;
                 if (F->hasFnAttribute("IndirectlyCalled"))
                 {
-                    // Check if all extern functions are added to the main kernel group
-                    FunctionGroup* FG = getGroup(F);
-                    FunctionGroup* defaultFG = getGroupForHead(getDefaultKernel());
-                    if (FG != defaultFG)
-                        return false;
                     continue;
                 }
                 // If F is an unused non-kernel function, although it should have been

visa/FlowGraph.cpp

@@ -5440,8 +5440,16 @@ void RelocationEntry::dump() const
     {
         case RelocationType::R_NONE:
             std::cerr << "R_NONE: symbol name = " << symName;
+            break;
         case RelocationType::R_SYM_ADDR:
             std::cerr << "R_SYM_ADDR: symbol name = " << symName;
+            break;
+        case RelocationType::R_SYM_ADDR_32:
+            std::cerr << "R_SYM_ADDR_32: symbol name = " << symName;
+            break;
+        case RelocationType::R_SYM_ADDR_32_HI:
+            std::cerr << "R_SYM_ADDR_32_HI: symbol name = " << symName;
+            break;
     }
     std::cerr << "\n";
 }

visa/FlowGraph.h

@@ -1235,12 +1235,12 @@ class RelocationEntry
     std::string symName;       // the symbol name that it's address to be resolved
 
     RelocationEntry(G4_INST* i, int pos, RelocationType type, const std::string& symbolName) :
-        inst(i), opndPos(pos), relocType(type), symName(symbolName) {}
+        inst(i), opndPos(pos), relocType(type), symName(symbolName){}
 
 public:
-    static RelocationEntry createSymbolAddrReloc(G4_INST* inst, int opndPos, const std::string& symbolName)
+    static RelocationEntry createSymbolAddrReloc(G4_INST* inst, int opndPos, const std::string& symbolName, RelocationType type)
     {
-        RelocationEntry entry(inst, opndPos, RelocationType::R_SYM_ADDR, symbolName);
+        RelocationEntry entry(inst, opndPos, type, symbolName);
         return entry;
     }
 
@@ -1260,6 +1260,10 @@ class RelocationEntry
         {
             case RelocationType::R_SYM_ADDR:
                 return "R_SYM_ADDR";
+            case RelocationType::R_SYM_ADDR_32:
+                return "R_SYM_ADDR_32";
+            case RelocationType::R_SYM_ADDR_32_HI:
+                return "R_SYM_ADDR_32_HI";
             default:
                 assert(false && "unhandled relocation type");
                 return "";
@@ -1273,7 +1277,12 @@ class RelocationEntry
 
     const std::string& getSymbolName() const
     {
-        assert(relocType == RelocationType::R_SYM_ADDR && "invalid relocation type");
+        bool isValidRelocType =
+            relocType == RelocationType::R_SYM_ADDR ||
+            relocType == RelocationType::R_SYM_ADDR_32 ||
+            relocType == RelocationType::R_SYM_ADDR_32_HI;
+
+        assert(isValidRelocType && "invalid relocation type");
         return symName;
     }
 

visa/TranslationInterface.cpp

@@ -2354,12 +2354,35 @@ int IR_Builder::translateVISACFSymbolInst(const std::string& symbolName, G4_DstR
     startTimer(TIMER_VISA_BUILDER_IR_CONSTRUCTION);
 #endif
 
-    // symbolic imm representing symbol's address
-    auto funcAddr = createRelocImm(Type_UQ);
-    auto movInst = createInst(nullptr, G4_mov, nullptr, false, 1, dst, funcAddr, nullptr, InstOpt_WriteEnable);
+    if (no64bitType())
+    {
+        auto* funcAddrLow = createRelocImm(Type_UD);
+        auto* funcAddrHigh = createRelocImm(Type_UD);
+
+        dst->setType(Type_UD);
+        G4_INST* movLo = createInst(nullptr, G4_mov, nullptr, false, 1, dst, funcAddrLow, nullptr, InstOpt_WriteEnable);
+        G4_DstRegRegion* tempDst = createDstRegRegion(*dst);
+
+        tempDst->setSubRegOff(1);
+        tempDst->setType(Type_UD);
+        G4_INST* movHi = createInst(nullptr, G4_mov, nullptr, false, 1, tempDst, funcAddrHigh, nullptr, InstOpt_WriteEnable);
+
+        RelocationEntry relocEntryLo = RelocationEntry::createSymbolAddrReloc(movLo, 0, symbolName, GenRelocType::R_SYM_ADDR_32);
+        kernel.addRelocation(relocEntryLo);
+
+        RelocationEntry relocEntryHi = RelocationEntry::createSymbolAddrReloc(movHi, 0, symbolName, GenRelocType::R_SYM_ADDR_32_HI);
+        kernel.addRelocation(relocEntryHi);
 
-    RelocationEntry relocEntry = RelocationEntry::createSymbolAddrReloc(movInst, 0, symbolName);
-    kernel.addRelocation(relocEntry);
+    }
+    else
+    {
+        // symbolic imm representing symbol's address
+        auto funcAddr = createRelocImm(Type_UQ);
+        auto movInst = createInst(nullptr, G4_mov, nullptr, false, 1, dst, funcAddr, nullptr, InstOpt_WriteEnable);
+
+        RelocationEntry relocEntry = RelocationEntry::createSymbolAddrReloc(movInst, 0, symbolName, GenRelocType::R_SYM_ADDR);
+        kernel.addRelocation(relocEntry);
+    }
 
 #if defined(MEASURE_COMPILATION_TIME) && defined(TIME_IR_CONSTRUCTION)
     stopTimer(TIMER_VISA_BUILDER_IR_CONSTRUCTION);

visa/include/RelocationInfo.h

@@ -57,7 +57,9 @@ typedef struct {
 /// GenRelocType - Specify the relocation's type
 enum GenRelocType {
     R_NONE     = 0,
-    R_SYM_ADDR = 1
+    R_SYM_ADDR = 1,      //64-bit type
+    R_SYM_ADDR_32 = 2,   //lower 32-bit of 64-bit address.
+    R_SYM_ADDR_32_HI = 3 //higher 32bits of 64-bit address
 };
 
 /// GenRelocEntry - An relocation table entry