Unreviewed, reverting 278474@main (36690be)

https://bugs.webkit.org/show_bug.cgi?id=273973
<radar://127121787>

This caused a regression in some CTS tests

Reverted change:

    [WebGPU] Invalid command buffers need to get dealloc'ed in a timely fashion
    https://bugs.webkit.org/show_bug.cgi?id=273328
    278474@main (36690be)

Canonical link: https://commits.webkit.org/278594@main

Source/WebGPU/WebGPU/CommandBuffer.h

@@ -42,9 +42,9 @@ class Device;
 class CommandBuffer : public WGPUCommandBufferImpl, public RefCounted<CommandBuffer>, public CanMakeWeakPtr<CommandBuffer> {
     WTF_MAKE_FAST_ALLOCATED;
 public:
-    static Ref<CommandBuffer> create(id<MTLCommandBuffer> commandBuffer, id<MTLSharedEvent> event, Device& device)
+    static Ref<CommandBuffer> create(id<MTLCommandBuffer> commandBuffer, Device& device)
     {
-        return adoptRef(*new CommandBuffer(commandBuffer, event, device));
+        return adoptRef(*new CommandBuffer(commandBuffer, device));
     }
     static Ref<CommandBuffer> createInvalid(Device& device)
     {
@@ -68,11 +68,10 @@ class CommandBuffer : public WGPUCommandBufferImpl, public RefCounted<CommandBuf
     void waitForCompletion();
 
 private:
-    CommandBuffer(id<MTLCommandBuffer>, id<MTLSharedEvent>, Device&);
+    CommandBuffer(id<MTLCommandBuffer>, Device&);
     CommandBuffer(Device&);
 
     id<MTLCommandBuffer> m_commandBuffer { nil };
-    id<MTLSharedEvent> m_abortEvent { nil };
     id<MTLCommandBuffer> m_cachedCommandBuffer { nil };
     int m_bufferMapCount { 0 };
 

Source/WebGPU/WebGPU/CommandBuffer.mm

@@ -30,9 +30,8 @@
 
 namespace WebGPU {
 
-CommandBuffer::CommandBuffer(id<MTLCommandBuffer> commandBuffer, id<MTLSharedEvent> event, Device& device)
+CommandBuffer::CommandBuffer(id<MTLCommandBuffer> commandBuffer, Device& device)
     : m_commandBuffer(commandBuffer)
-    , m_abortEvent(event)
     , m_device(device)
 {
 }
@@ -51,7 +50,6 @@
 
 void CommandBuffer::makeInvalid(NSString* lastError)
 {
-    [m_abortEvent setSignaledValue:1];
     m_lastErrorString = lastError;
     m_device->getQueue().commitMTLCommandBuffer(m_commandBuffer);
     m_commandBuffer = nil;

Source/WebGPU/WebGPU/CommandEncoder.h

@@ -57,9 +57,9 @@ class Texture;
 class CommandEncoder : public WGPUCommandEncoderImpl, public RefCounted<CommandEncoder>, public CommandsMixin, public CanMakeWeakPtr<CommandEncoder> {
     WTF_MAKE_FAST_ALLOCATED;
 public:
-    static Ref<CommandEncoder> create(id<MTLCommandBuffer> commandBuffer, id<MTLSharedEvent> event, Device& device)
+    static Ref<CommandEncoder> create(id<MTLCommandBuffer> commandBuffer, Device& device)
     {
-        return adoptRef(*new CommandEncoder(commandBuffer, event, device));
+        return adoptRef(*new CommandEncoder(commandBuffer, device));
     }
     static Ref<CommandEncoder> createInvalid(Device& device)
     {
@@ -106,7 +106,7 @@ class CommandEncoder : public WGPUCommandEncoderImpl, public RefCounted<CommandE
     bool encoderIsCurrent(id<MTLCommandEncoder>) const;
 
 private:
-    CommandEncoder(id<MTLCommandBuffer>, id<MTLSharedEvent>, Device&);
+    CommandEncoder(id<MTLCommandBuffer>, Device&);
     CommandEncoder(Device&);
 
     NSString* errorValidatingCopyBufferToBuffer(const Buffer& source, uint64_t sourceOffset, const Buffer& destination, uint64_t destinationOffset, uint64_t size);
@@ -123,7 +123,6 @@ class CommandEncoder : public WGPUCommandEncoderImpl, public RefCounted<CommandE
     NSString* errorValidatingCopyTextureToBuffer(const WGPUImageCopyTexture&, const WGPUImageCopyBuffer&, const WGPUExtent3D&) const;
 
     id<MTLCommandBuffer> m_commandBuffer { nil };
-    id<MTLSharedEvent> m_abortCommandBuffer { nil };
     id<MTLBlitCommandEncoder> m_blitCommandEncoder { nil };
     id<MTLCommandEncoder> m_existingCommandEncoder { nil };
     struct PendingTimestampWrites {

Source/WebGPU/WebGPU/CommandEncoder.mm

@@ -98,18 +98,17 @@ static MTLStoreAction storeAction(WGPUStoreOp storeOp, bool hasResolveTarget = f
 
     auto *commandBufferDescriptor = [MTLCommandBufferDescriptor new];
     commandBufferDescriptor.errorOptions = MTLCommandBufferErrorOptionEncoderExecutionStatus;
-    auto commandBufferWithEvent = getQueue().commandBufferWithDescriptor(commandBufferDescriptor);
-    if (!commandBufferWithEvent.first)
+    id<MTLCommandBuffer> commandBuffer = getQueue().commandBufferWithDescriptor(commandBufferDescriptor);
+    if (!commandBuffer)
         return CommandEncoder::createInvalid(*this);
 
-    commandBufferWithEvent.first.label = fromAPI(descriptor.label);
+    commandBuffer.label = fromAPI(descriptor.label);
 
-    return CommandEncoder::create(commandBufferWithEvent.first, commandBufferWithEvent.second, *this);
+    return CommandEncoder::create(commandBuffer, *this);
 }
 
-CommandEncoder::CommandEncoder(id<MTLCommandBuffer> commandBuffer, id<MTLSharedEvent> event, Device& device)
+CommandEncoder::CommandEncoder(id<MTLCommandBuffer> commandBuffer, Device& device)
     : m_commandBuffer(commandBuffer)
-    , m_abortCommandBuffer(event)
     , m_device(device)
 {
 }
@@ -1201,7 +1200,6 @@ static bool refersToAllAspects(WGPUTextureFormat format, WGPUTextureAspect aspec
 {
     endEncoding(m_existingCommandEncoder);
     m_blitCommandEncoder = nil;
-    [m_abortCommandBuffer setSignaledValue:1];
     m_device->getQueue().commitMTLCommandBuffer(m_commandBuffer);
 
     m_commandBuffer = nil;
@@ -1745,8 +1743,7 @@ static bool areCopyCompatible(WGPUTextureFormat format1, WGPUTextureFormat forma
 
     commandBuffer.label = fromAPI(descriptor.label);
 
-    auto result = CommandBuffer::create(commandBuffer, m_abortCommandBuffer, m_device);
-    m_abortCommandBuffer = nil;
+    auto result = CommandBuffer::create(commandBuffer, m_device);
     m_cachedCommandBuffer = result;
     m_cachedCommandBuffer->setBufferMapCount(m_bufferMapCount);
     if (m_makeSubmitInvalid)

Source/WebGPU/WebGPU/MetalSPI.h

@@ -24,14 +24,10 @@
  */
 
 #if USE(INTERNAL_APPLE_SDK)
-#import <Metal/MTLCommandBuffer_Private.h>
 #import <Metal/MTLResource_Private.h>
 #else
 @protocol MTLResourceSPI <MTLResource>
 @optional
 - (kern_return_t)setOwnerWithIdentity:(mach_port_t)task_id_token;
 @end
-@protocol MTLCommandBufferSPI <MTLCommandBuffer>
-- (void)encodeConditionalAbortEvent:(id <MTLSharedEvent>)event;
-@end
 #endif

Source/WebGPU/WebGPU/PresentationContextIOSurface.mm

@@ -311,7 +311,7 @@ kernel void luminanceClamp(texture2d<float, access::read>  inTexture  [[texture(
     if (Texture* texturePtr = textureRefPtr.get(); texturePtr && m_computePipelineState) {
         MTLCommandBufferDescriptor *descriptor = [MTLCommandBufferDescriptor new];
         descriptor.errorOptions = MTLCommandBufferErrorOptionEncoderExecutionStatus;
-        id<MTLCommandBuffer> commandBuffer = m_device->getQueue().commandBufferWithDescriptor(descriptor).first;
+        id<MTLCommandBuffer> commandBuffer = m_device->getQueue().commandBufferWithDescriptor(descriptor);
         MTLComputePassDescriptor* computeDescriptor = [MTLComputePassDescriptor new];
         computeDescriptor.dispatchType = MTLDispatchTypeSerial;
 

Source/WebGPU/WebGPU/Queue.h

@@ -75,7 +75,7 @@ class Queue : public WGPUQueueImpl, public ThreadSafeRefCounted<Queue> {
 
     const Device& device() const;
     void clearTextureIfNeeded(const WGPUImageCopyTexture&, NSUInteger);
-    std::pair<id<MTLCommandBuffer>, id<MTLSharedEvent>> commandBufferWithDescriptor(MTLCommandBufferDescriptor*);
+    id<MTLCommandBuffer> commandBufferWithDescriptor(MTLCommandBufferDescriptor*);
     void commitMTLCommandBuffer(id<MTLCommandBuffer>);
     void setEncoderForBuffer(id<MTLCommandBuffer>, id<MTLCommandEncoder>);
     id<MTLCommandEncoder> encoderForBuffer(id<MTLCommandBuffer>) const;
@@ -101,7 +101,6 @@ class Queue : public WGPUQueueImpl, public ThreadSafeRefCounted<Queue> {
 
     id<MTLCommandQueue> m_commandQueue { nil };
     id<MTLCommandBuffer> m_commandBuffer { nil };
-    id<MTLSharedEvent> m_commandBufferEvent { nil };
     id<MTLBlitCommandEncoder> m_blitCommandEncoder { nil };
     ThreadSafeWeakPtr<Device> m_device; // The only kind of queues that exist right now are default queues, which are owned by Devices.
 

Source/WebGPU/WebGPU/Queue.mm

@@ -32,7 +32,6 @@
 #import "CommandEncoder.h"
 #import "Device.h"
 #import "IsValidToUseWith.h"
-#import "MetalSPI.h"
 #import "Texture.h"
 #import "TextureView.h"
 #import <wtf/CheckedArithmetic.h>
@@ -71,9 +70,7 @@
 
     auto *commandBufferDescriptor = [MTLCommandBufferDescriptor new];
     commandBufferDescriptor.errorOptions = MTLCommandBufferErrorOptionEncoderExecutionStatus;
-    auto blitCommandBufferWithSharedEvent = commandBufferWithDescriptor(commandBufferDescriptor);
-    m_commandBuffer = blitCommandBufferWithSharedEvent.first;
-    m_commandBufferEvent = blitCommandBufferWithSharedEvent.second;
+    m_commandBuffer = commandBufferWithDescriptor(commandBufferDescriptor);
     m_blitCommandEncoder = [m_commandBuffer blitCommandEncoder];
 }
 
@@ -106,7 +103,7 @@
         [m_openCommandEncoders setObject:commandEncoder forKey:commandBuffer];
 }
 
-std::pair<id<MTLCommandBuffer>, id<MTLSharedEvent>> Queue::commandBufferWithDescriptor(MTLCommandBufferDescriptor* descriptor)
+id<MTLCommandBuffer> Queue::commandBufferWithDescriptor(MTLCommandBufferDescriptor* descriptor)
 {
     constexpr auto maxCommandBufferCount = 64;
     if (m_createdNotCommittedBuffers.count >= maxCommandBufferCount) {
@@ -121,14 +118,8 @@
     id<MTLCommandBuffer> buffer = [m_commandQueue commandBufferWithDescriptor:descriptor];
     if (buffer)
         [m_createdNotCommittedBuffers addObject:buffer];
-    auto devicePtr = m_device.get();
-    id<MTLSharedEvent> sharedEvent = nil;
-    if (devicePtr && [buffer respondsToSelector:@selector(encodeConditionalAbortEvent:)]) {
-        sharedEvent = [devicePtr->device() newSharedEvent];
-        [(id<MTLCommandBufferSPI>)buffer encodeConditionalAbortEvent:sharedEvent];
-    }
 
-    return std::make_pair(buffer, sharedEvent);
+    return buffer;
 }
 
 void Queue::makeInvalid()