Correct mistaken merge

Author: Greg Roth

llvm/lib/Target/DirectX/DXILFinalizeLinkage.cpp

@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 //===- DXILFinalizeLinkage.cpp - Finalize linkage of functions ------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
@@ -64,70 +63,3 @@ INITIALIZE_PASS_END(DXILFinalizeLinkageLegacy, DEBUG_TYPE,
 ModulePass *llvm::createDXILFinalizeLinkageLegacyPass() {
   return new DXILFinalizeLinkageLegacy();
 }
-=======
-//===- DXILFinalizeLinkage.cpp - Finalize linkage of functions ------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "DXILFinalizeLinkage.h"
-#include "DirectX.h"
-#include "llvm/Analysis/DXILResource.h"
-#include "llvm/IR/Function.h"
-#include "llvm/IR/GlobalValue.h"
-#include "llvm/IR/Metadata.h"
-#include "llvm/IR/Module.h"
-
-#define DEBUG_TYPE "dxil-finalize-linkage"
-
-using namespace llvm;
-
-static bool finalizeLinkage(Module &M) {
-  SmallPtrSet<Function *, 8> EntriesAndExports;
-
-  // Find all entry points and export functions
-  for (Function &EF : M.functions()) {
-    if (!EF.hasFnAttribute("hlsl.shader") && !EF.hasFnAttribute("hlsl.export"))
-      continue;
-    EntriesAndExports.insert(&EF);
-  }
-
-  for (Function &F : M.functions()) {
-    if (F.getLinkage() == GlobalValue::ExternalLinkage &&
-        !EntriesAndExports.contains(&F)) {
-      F.setLinkage(GlobalValue::InternalLinkage);
-    }
-  }
-
-  return false;
-}
-
-PreservedAnalyses DXILFinalizeLinkage::run(Module &M,
-                                           ModuleAnalysisManager &AM) {
-  if (finalizeLinkage(M))
-    return PreservedAnalyses::none();
-  return PreservedAnalyses::all();
-}
-
-bool DXILFinalizeLinkageLegacy::runOnModule(Module &M) {
-  return finalizeLinkage(M);
-}
-
-void DXILFinalizeLinkageLegacy::getAnalysisUsage(AnalysisUsage &AU) const {
-  AU.addPreserved<DXILResourceWrapperPass>();
-}
-
-char DXILFinalizeLinkageLegacy::ID = 0;
-
-INITIALIZE_PASS_BEGIN(DXILFinalizeLinkageLegacy, DEBUG_TYPE,
-                      "DXIL Finalize Linkage", false, false)
-INITIALIZE_PASS_END(DXILFinalizeLinkageLegacy, DEBUG_TYPE,
-                    "DXIL Finalize Linkage", false, false)
-
-ModulePass *llvm::createDXILFinalizeLinkageLegacyPass() {
-  return new DXILFinalizeLinkageLegacy();
-}
->>>>>>> refs/remotes/origin/main

llvm/test/CodeGen/DirectX/finalize_linkage.ll

@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 ; RUN: opt -S -dxil-finalize-linkage -mtriple=dxil-unknown-shadermodel6.5-compute %s | FileCheck %s
 ; RUN: llc %s --filetype=asm -o - | FileCheck %s --check-prefixes=CHECK-LLC
 
@@ -63,69 +62,3 @@ attributes #3 = { convergent }
 
 ; Make sure "hlsl.export" attribute is stripped by llc
 ; CHECK-LLC-NOT: "hlsl.export"
-=======
-; RUN: opt -S -dxil-finalize-linkage -mtriple=dxil-unknown-shadermodel6.5-compute %s | FileCheck %s
-; RUN: llc %s --filetype=asm -o - | FileCheck %s --check-prefixes=CHECK-LLC
-
-target triple = "dxilv1.5-pc-shadermodel6.5-compute"
-
-; DXILFinalizeLinkage changes linkage of all functions that are not
-; entry points or exported function to internal.
-
-; CHECK: define internal void @"?f1@@YAXXZ"()
-define void @"?f1@@YAXXZ"() #0 {
-entry:
-  ret void
-}
-
-; CHECK: define internal void @"?f2@@YAXXZ"()
-define void @"?f2@@YAXXZ"() #0 {
-entry:
-  ret void
-}
-
-; CHECK: define internal void @"?f3@@YAXXZ"()
-define void @"?f3@@YAXXZ"() #0 {
-entry:
-  ret void
-}
-
-; CHECK: define internal void @"?foo@@YAXXZ"()
-define void @"?foo@@YAXXZ"() #0 {
-entry:
-  call void @"?f2@@YAXXZ"() #3
-  ret void
-}
-
-; Exported function - do not change linkage
-; CHECK: define void @"?bar@@YAXXZ"()
-define void @"?bar@@YAXXZ"() #1 {
-entry:
-  call void @"?f3@@YAXXZ"() #3
-  ret void
-}
-
-; CHECK: define internal void @"?main@@YAXXZ"() #0
-define internal void @"?main@@YAXXZ"() #0 {
-entry:
-  call void @"?foo@@YAXXZ"() #3
-  call void @"?bar@@YAXXZ"() #3
-  ret void
-}
-
-; Entry point function - do not change linkage
-; CHECK: define void @main() #2
-define void @main() #2 {
-entry:
-  call void @"?main@@YAXXZ"()
-  ret void
-}
-
-attributes #0 = { convergent noinline nounwind optnone}
-attributes #1 = { convergent noinline nounwind optnone "hlsl.export"}
-attributes #2 = { convergent "hlsl.numthreads"="4,1,1" "hlsl.shader"="compute"}
-attributes #3 = { convergent }
-
-; Make sure "hlsl.export" attribute is stripped by llc
-; CHECK-LLC-NOT: "hlsl.export"
->>>>>>> refs/remotes/origin/main