Add support for bitcast and addrspacecast to PromoteBools pass.

Add support for bitcast and addrspacecast to PromoteBools pass.

Author: mateuszchudyk

IGC/AdaptorOCL/preprocess_spvir/PromoteBools.cpp

@@ -258,6 +258,14 @@ void PromoteBools::cleanUp(Module& module)
         {
             renameAndClean(alloca, it.second);
         }
+        else if (auto bitcast = dyn_cast<BitCastInst>(it.first))
+        {
+            renameAndClean(bitcast, it.second);
+        }
+        else if (auto addrSpaceCast = dyn_cast<AddrSpaceCastInst>(it.first))
+        {
+            renameAndClean(addrSpaceCast, it.second);
+        }
     }
 
     std::vector<Instruction*> deadTruncs;
@@ -376,6 +384,14 @@ Value* PromoteBools::getOrCreatePromotedValue(Value* value)
     {
         newValue = promoteAlloca(alloca);
     }
+    else if (auto bitcast = dyn_cast<BitCastInst>(value))
+    {
+        newValue = promoteBitCast(bitcast);
+    }
+    else if (auto addrSpaceCast = dyn_cast<AddrSpaceCastInst>(value))
+    {
+        newValue = promoteAddrSpaceCast(addrSpaceCast);
+    }
 
     if (newValue != value)
     {
@@ -481,22 +497,74 @@ GlobalVariable* PromoteBools::promoteGlobalVariable(GlobalVariable* globalVariab
         globalVariable->getType()->getPointerAddressSpace());
 }
 
-AllocaInst* PromoteBools::promoteAlloca(AllocaInst* alloca)
+Value* PromoteBools::promoteAlloca(AllocaInst* alloca)
 {
     if (!alloca || !typeNeedsPromotion(alloca->getAllocatedType()))
     {
         return alloca;
     }
 
+    auto oldAllocaName = alloca->getName().str();
+    alloca->setName(oldAllocaName + "_bitcast");
+
     auto newAlloca = new AllocaInst(
         getOrCreatePromotedType(alloca->getAllocatedType()),
         alloca->getType()->getAddressSpace(),
         alloca->isArrayAllocation() ? alloca->getArraySize() : nullptr,
-        alloca->getName(),
+        oldAllocaName,
         alloca);
     newAlloca->setAlignment(IGCLLVM::getAlign(*alloca));
 
-    return newAlloca;
+    IRBuilder<> builder(alloca);
+    auto bitcast = builder.CreateBitCast(newAlloca, alloca->getType());
+    alloca->replaceAllUsesWith(bitcast);
+
+    return bitcast;
+}
+
+Value* PromoteBools::promoteBitCast(BitCastInst* bitcast)
+{
+    if (!bitcast || !typeNeedsPromotion(bitcast->getDestTy()))
+    {
+        return bitcast;
+    }
+
+    auto newType = getOrCreatePromotedType(bitcast->getDestTy());
+    if (bitcast->getSrcTy() == newType)
+    {
+        auto result = bitcast->getOperand(0);
+
+        // swap names
+        auto name = result->getName().str();
+        result->setName(name + "_tmp");
+        bitcast->setName(name);
+
+        return result;
+    }
+
+    auto newBitCast = new BitCastInst(
+        bitcast->getOperand(0),
+        getOrCreatePromotedType(bitcast->getDestTy()),
+        bitcast->getName(),
+        bitcast
+    );
+    return newBitCast;
+}
+
+Value* PromoteBools::promoteAddrSpaceCast(AddrSpaceCastInst* addrSpaceCast)
+{
+    if (!addrSpaceCast || !typeNeedsPromotion(addrSpaceCast->getDestTy()))
+    {
+        return addrSpaceCast;
+    }
+
+    auto newAddrSpaceCast = new AddrSpaceCastInst(
+        addrSpaceCast->getOperand(0),
+        getOrCreatePromotedType(addrSpaceCast->getDestTy()),
+        addrSpaceCast->getName(),
+        addrSpaceCast
+    );
+    return newAddrSpaceCast;
 }
 
 Constant* PromoteBools::createPromotedConstant(Constant* constant)

IGC/AdaptorOCL/preprocess_spvir/PromoteBools.h

@@ -57,7 +57,9 @@ namespace IGC
         llvm::Value* getOrCreatePromotedValue(llvm::Value* value);
         llvm::Function* promoteFunction(llvm::Function* function);
         llvm::GlobalVariable* promoteGlobalVariable(llvm::GlobalVariable* globalVariable);
-        llvm::AllocaInst* promoteAlloca(llvm::AllocaInst* alloca);
+        llvm::Value* promoteAlloca(llvm::AllocaInst* alloca);
+        llvm::Value* promoteBitCast(llvm::BitCastInst* bitcast);
+        llvm::Value* promoteAddrSpaceCast(llvm::AddrSpaceCastInst* addrSpaceCast);
 
         // Promoting contants
         llvm::Constant* createPromotedConstant(llvm::Constant* constant);

IGC/Compiler/tests/PromoteBools/casts.ll

@@ -0,0 +1,61 @@
+;=========================== begin_copyright_notice ============================
+;
+; Copyright (C) 2022 Intel Corporation
+;
+; SPDX-License-Identifier: MIT
+;
+;============================ end_copyright_notice =============================
+
+; RUN: igc_opt -igc-promote-bools  -S %s -o %t.ll
+; RUN: FileCheck %s --input-file=%t.ll
+
+define spir_func void @bitcast_i32_to_i1() {
+  %allocated = alloca i32, align 1
+  %casted = bitcast i32* %allocated to i1*
+  %value = load i1, i1* %casted
+  ret void
+}
+
+; CHECK-LABEL:  define spir_func void @bitcast_i32_to_i1()
+; CHECK-NEXT:   %allocated = alloca i32, align 1
+; CHECK-NEXT:   %casted = bitcast i32* %allocated to i8*
+; CHECK-NEXT:   %value = load i8, i8* %casted
+
+
+define spir_func void @bitcast_i8_to_i1() {
+  %allocated = alloca i8, align 1
+  %casted = bitcast i8* %allocated to i1*
+  %value = load i1, i1* %casted
+  ret void
+}
+
+; CHECK-LABEL:  define spir_func void @bitcast_i8_to_i1()
+; CHECK-NEXT:   %allocated = alloca i8, align 1
+; CHECK-NEXT:   %value = load i8, i8* %allocated
+
+
+define spir_func void @addrspacecast_i32_to_i1() {
+  %allocated = alloca i32, align 1
+  %casted = addrspacecast i32* %allocated to i1 addrspace(4)*
+  %value = load i1, i1 addrspace(4)* %casted
+  ret void
+}
+
+; CHECK-LABEL:  define spir_func void @addrspacecast_i32_to_i1()
+; CHECK-NEXT:   %allocated = alloca i32, align 1
+; CHECK-NEXT:   %casted = addrspacecast i32* %allocated to i8 addrspace(4)*
+; CHECK-NEXT:   %value = load i8, i8 addrspace(4)* %casted
+
+
+define spir_func void @addrspacecast_i1() {
+  %allocated = alloca i1, align 1
+  %casted = addrspacecast i1* %allocated to i1 addrspace(4)*
+  %value = load i1, i1 addrspace(4)* %casted
+  ret void
+}
+
+; CHECK-LABEL:  define spir_func void @addrspacecast_i1()
+; CHECK-NEXT:   %allocated = alloca i8, align 1
+; CHECK-NEXT:   %allocated_bitcast = bitcast i8* %allocated to i1*
+; CHECK-NEXT:   %casted = addrspacecast i1* %allocated_bitcast to i8 addrspace(4)*
+; CHECK-NEXT:   %value = load i8, i8 addrspace(4)* %casted