[ET-VK][binary] Nest binary operator sources

backends/vulkan/op_registry.py

@@ -248,7 +248,7 @@ def register_clamp():
 
 
 # =============================================================================
-# BinaryOp.cpp
+# binary/BinaryOp.cpp
 # =============================================================================
 
 
@@ -302,7 +302,7 @@ def register_comparison_ops():
 
 
 # =============================================================================
-# BinaryOp.cpp (bitwise)
+# binary/BinaryOp.cpp (bitwise)
 # =============================================================================
 
 
@@ -325,7 +325,7 @@ def register_bool_binary_ops():
 
 
 # =============================================================================
-# BinaryScalarOp.cpp
+# binary/BinaryScalarOp.cpp
 # =============================================================================
 
 
@@ -627,7 +627,7 @@ def register_torchao_choose_qparams_affine():
 
 
 # =============================================================================
-# Q8taBinary.cpp
+# binary/q8ta/Q8taBinary.cpp
 # =============================================================================
 
 

backends/vulkan/test/custom_ops/impl/TestQ8taBinary.cpp

@@ -9,8 +9,8 @@
 #include <executorch/backends/vulkan/runtime/graph/ops/OperatorRegistry.h>
 
 #include <executorch/backends/vulkan/runtime/graph/ops/impl/Int8x4Staging.h>
-#include <executorch/backends/vulkan/runtime/graph/ops/impl/Q8taBinary.h>
 #include <executorch/backends/vulkan/runtime/graph/ops/impl/Q8taQuantizeDequantize.h>
+#include <executorch/backends/vulkan/runtime/graph/ops/impl/binary/q8ta/Q8taBinary.h>
 
 namespace vkcompute {
 

backends/vulkan/test/test_vulkan_shader_names.py

@@ -24,6 +24,7 @@
 """
 
 import importlib.util
+import os
 import re
 import unittest
 from pathlib import Path
@@ -42,7 +43,12 @@
 _spec.loader.exec_module(gen_vulkan_spv)
 
 # The yaml templates whose variants `add_binary_op_node` dispatches into.
-_BINARY_TEMPLATES = ("binary_op_buffer", "binary_op_texture")
+_BINARY_BUFFER_TEMPLATE = os.path.join("binary", "binary_op_buffer")
+_BINARY_TEXTURE_TEMPLATE = os.path.join("binary", "binary_op_texture")
+_BINARY_TEMPLATES = (
+    _BINARY_BUFFER_TEMPLATE,
+    _BINARY_TEXTURE_TEMPLATE,
+)
 
 
 def _function_body(text: str, name: str) -> str:
@@ -113,8 +119,8 @@ def test_int32_eq_shaders_are_named_for_the_dispatcher(self) -> None:
         build. Kokoro's synthesizer aborted on it.
         """
         for template, expected in (
-            ("binary_op_buffer", "binary_eq_buffer_int32"),
-            ("binary_op_texture", "binary_eq_texture3d_int32"),
+            (_BINARY_BUFFER_TEMPLATE, "binary_eq_buffer_int32"),
+            (_BINARY_TEXTURE_TEMPLATE, "binary_eq_texture3d_int32"),
         ):
             with self.subTest(template=template):
                 self.assertIn(expected, self.names[template])