From e8e4f415f22340aefe2643b84a0a9ae5781b729c Mon Sep 17 00:00:00 2001
From: Jeff Fifield <jeff.fifield@amd.com>
Date: Fri, 18 Oct 2024 10:33:30 -0600
Subject: [PATCH] fix merge error

---
 mlir/lib/Conversion/AIRToAIEPass.cpp | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/mlir/lib/Conversion/AIRToAIEPass.cpp b/mlir/lib/Conversion/AIRToAIEPass.cpp
index 7506540d1..8ebf69cc4 100644
--- a/mlir/lib/Conversion/AIRToAIEPass.cpp
+++ b/mlir/lib/Conversion/AIRToAIEPass.cpp
@@ -354,18 +354,6 @@ void outlineAIECores(OpBuilder &builder, AIE::DeviceOp aie_device,
               AIE::LockAction::AcquireGreaterEqual, 1);
         }
       }
-      if (options.emit_herd_lock) {
-        if (aie_device.getTargetModel().getTargetArch() == AIE::AIEArch::AIE1) {
-          core_builder.create<AIE::UseLockOp>(core_builder.getUnknownLoc(),
-                                              herd_lock,
-                                              AIE::LockAction::Acquire, 0);
-        } else if (aie_device.getTargetModel().getTargetArch() ==
-                   AIE::AIEArch::AIE2) {
-          core_builder.create<AIE::UseLockOp>(
-              core_builder.getUnknownLoc(), herd_lock,
-              AIE::LockAction::AcquireGreaterEqual, 1);
-        }
-      }
 
       for (unsigned ki = 0, ke = h.getNumKernelOperands(); ki < ke; ki++) {
         BlockArgument karg = h.getKernelArgument(ki);