[AOTI][refactor][1/n] Rename cpp_kernel to cpp_kernel_name (pytorch#115783)

Differential Revision: [D52142184](https://our.internmc.facebook.com/intern/diff/D52142184)

Pull Request resolved: pytorch#115783
Approved by: https://github.com/chenyang78, https://github.com/jansel

Author: desertfire

torch/_inductor/ir.py

@@ -3902,7 +3902,7 @@ def codegen(self, wrapper):
             self.output_view,
             self.codegen_reference(),
             args,
-            self.cpp_kernel if V.graph.cpp_wrapper else self.kernel,
+            self.cpp_kernel_name if V.graph.cpp_wrapper else self.kernel,
         )
 
     def __init__(
@@ -3913,7 +3913,7 @@ def __init__(
         kwargs=None,
         output_view=None,
         kernel=None,
-        cpp_kernel=None,
+        cpp_kernel_name=None,
         ordered_kwargs_for_cpp_kernel=(),
     ):
         super().__init__(
@@ -3922,7 +3922,7 @@ def __init__(
         self.output_view = output_view
         self.name = V.graph.register_buffer(self)
         self.kernel = kernel
-        self.cpp_kernel = cpp_kernel
+        self.cpp_kernel_name = cpp_kernel_name
         self.ordered_kwargs_for_cpp_kernel = ordered_kwargs_for_cpp_kernel
 
     def should_allocate(self):
@@ -3941,13 +3941,13 @@ def __init__(self, count: int, device: torch.device):
             inputs=[],
             constant_args=[limits.min, limits.max, [count]],
             kernel="aten.randint.low_out",
-            cpp_kernel="at::randint_out",
+            cpp_kernel_name="at::randint_out",
         )
 
 
 class ExternKernelAlloc(ExternKernel):
     def codegen_kernel_name(self):
-        return self.cpp_kernel if V.graph.cpp_wrapper else self.kernel
+        return self.cpp_kernel_name if V.graph.cpp_wrapper else self.kernel
 
     def codegen(self, wrapper):
         self.codegen_comment(wrapper)
@@ -3963,15 +3963,15 @@ def __init__(
         constant_args=(),
         kwargs=None,
         kernel=None,
-        cpp_kernel=None,
+        cpp_kernel_name=None,
         ordered_kwargs_for_cpp_kernel=(),
     ):
         super().__init__(
             None, layout, self.unwrap_storage(inputs), constant_args, kwargs or {}
         )
         self.name = V.graph.register_buffer(self)
         self.kernel = kernel
-        self.cpp_kernel = cpp_kernel
+        self.cpp_kernel_name = cpp_kernel_name
         self.ordered_kwargs_for_cpp_kernel = ordered_kwargs_for_cpp_kernel
 
     def should_allocate(self):
@@ -4182,7 +4182,7 @@ def codegen(self, wrapper):
             get_operator_enum = {"add": "sum", "multiply": "prod"}
             if reduce in get_operator_enum:
                 reduce = get_operator_enum[reduce]
-            self.cpp_kernel = self.get_cpp_kernel(self.fn, reduce)
+            self.cpp_kernel_name = self.get_cpp_kernel(self.fn, reduce)
 
         if self.src_is_tensor:
             (x, index, src) = (t.codegen_reference() for t in self.inputs)
@@ -4192,7 +4192,7 @@ def codegen(self, wrapper):
         wrapper.generate_scatter_fallback(
             x,
             [x, self.constant_args[0], index, src],
-            self.cpp_kernel if V.graph.cpp_wrapper else self.kernel,
+            self.cpp_kernel_name if V.graph.cpp_wrapper else self.kernel,
             self.fn,
             self.src_is_tensor,
             reduce,
@@ -4281,7 +4281,7 @@ def codegen(self, wrapper):
         args = [x, indices_str, values, *self.codegen_const_args()]
         wrapper.writeline(
             wrapper.wrap_kernel_call(
-                self.cpp_kernel if V.graph.cpp_wrapper else self.kernel, args
+                self.cpp_kernel_name if V.graph.cpp_wrapper else self.kernel, args
             )
         )
 
@@ -4305,7 +4305,7 @@ def __init__(self, x, indices, values, accumulate):
             (accumulate,),
         )
         self.name = V.graph.register_buffer(self)
-        self.cpp_kernel = "at::index_put_"
+        self.cpp_kernel_name = "at::index_put_"
         self.kernel = "aten.index_put_"
         mark_node_as_mutating(self, x)
 
@@ -4452,10 +4452,10 @@ def is_not_write(arg):
             is_not_write(x) for x in kernel._schema.returns
         ), f"{kernel.__name__} with alias_info returns is not supported with cpp_wrapper"
 
-        self.cpp_kernel = kernel._schema.name
+        self.cpp_kernel_name = kernel._schema.name
         self.cpp_kernel_overload_name = kernel._schema.overload_name
         self.cpp_kernel_key = (
-            f"{self.cpp_kernel.replace('::', '_')}_{self.cpp_kernel_overload_name}"
+            f"{self.cpp_kernel_name.replace('::', '_')}_{self.cpp_kernel_overload_name}"
         )
 
         self.cpp_op_schema = get_cpp_op_schema(kernel)
@@ -4489,14 +4489,14 @@ def sdpa_ver_fn():
                 self.get_kwargs_value(arg_name) is None
                 for arg_name in self.ordered_kwargs_for_cpp_kernel
             ):
-                return f"{self.cpp_kernel}_v2"
+                return f"{self.cpp_kernel_name}_v2"
             else:
-                return self.cpp_kernel
+                return self.cpp_kernel_name
 
         kernel_to_ver = {"at::_scaled_dot_product_flash_attention": sdpa_ver_fn}
-        if (ver_fn := kernel_to_ver.get(self.cpp_kernel, None)) is not None:
+        if (ver_fn := kernel_to_ver.get(self.cpp_kernel_name, None)) is not None:
             return ver_fn()
-        return self.cpp_kernel
+        return self.cpp_kernel_name
 
     def codegen_args(self):
         @dataclasses.dataclass
@@ -4667,7 +4667,7 @@ def codegen(self, wrapper):
                     # repeat_interleave(const at::Tensor & repeats, c10::optional<int64_t> output_size=c10::nullopt)
                     # repeat_interleave(const at::Tensor & self, int64_t repeats,
                     #       c10::optional<int64_t> dim=c10::nullopt, c10::optional<int64_t> output_size=c10::nullopt)
-                    self.cpp_kernel = (
+                    self.cpp_kernel_name = (
                         f"at::{op_base_name}"
                         if kernel._overloadname == "default"
                         else f"at::_ops::{kernel.__name__.replace('.', '_')}::call"
@@ -5121,7 +5121,7 @@ def __init__(
             constant_args,
             None,
             kernel="torch.ops.mkldnn._convolution_pointwise",
-            cpp_kernel="mkldnn::_convolution_pointwise",
+            cpp_kernel_name="mkldnn::_convolution_pointwise",
         )
         self.cpp_kernel_key = "convolution_pointwise"
         self.cpp_op_schema = """
@@ -5140,7 +5140,7 @@ def __init__(
     def codegen(self, wrapper):
         wrapper.generate_extern_kernel_alloc_and_find_schema_if_needed(
             self.get_name(),
-            self.cpp_kernel if V.graph.cpp_wrapper else self.kernel,
+            self.cpp_kernel_name if V.graph.cpp_wrapper else self.kernel,
             self.codegen_args(),
             self.cpp_op_schema,
             self.cpp_kernel_key,
@@ -5191,7 +5191,7 @@ def __init__(
             constant_args,
             None,
             kernel="torch.ops.mkldnn._convolution_pointwise.binary",
-            cpp_kernel="mkldnn::_convolution_pointwise",
+            cpp_kernel_name="mkldnn::_convolution_pointwise",
         )
         self.cpp_kernel_overload_name = "binary"
         self.cpp_kernel_key = "convolution_pointwise_binary"
@@ -5281,7 +5281,7 @@ def __init__(
             constant_args,
             None,
             kernel="torch.ops.mkldnn._convolution_pointwise_.binary",
-            cpp_kernel="mkldnn::_convolution_pointwise_",
+            cpp_kernel_name="mkldnn::_convolution_pointwise_",
         )
         self.cpp_kernel_overload_name = "binary"
         self.cpp_kernel_key = "convolution_pointwise_binary_"
@@ -5377,7 +5377,7 @@ def __init__(
             constant_args,
             None,
             kernel="torch.ops.mkl._mkl_linear",
-            cpp_kernel="mkl::_mkl_linear",
+            cpp_kernel_name="mkl::_mkl_linear",
         )
         self.cpp_kernel_key = "mkl_linear"
         self.cpp_op_schema = """
@@ -5430,7 +5430,7 @@ def __init__(
             constant_args,
             None,
             kernel="torch.ops.mkldnn._linear_pointwise",
-            cpp_kernel="mkldnn::_linear_pointwise",
+            cpp_kernel_name="mkldnn::_linear_pointwise",
         )
         self.cpp_kernel_key = "linear_pointwise"
         self.cpp_op_schema = """
@@ -5495,7 +5495,7 @@ def __init__(
             constant_args,
             None,
             kernel="torch.ops.mkldnn._linear_pointwise.binary",
-            cpp_kernel="mkldnn::_linear_pointwise",
+            cpp_kernel_name="mkldnn::_linear_pointwise",
         )
         self.cpp_kernel_overload_name = "binary"
         self.cpp_kernel_key = "linear_pointwise_binary"
@@ -5562,7 +5562,7 @@ def __init__(
             constant_args,
             None,
             kernel="torch.ops.mkldnn._convolution_transpose_pointwise",
-            cpp_kernel="mkldnn::_convolution_transpose_pointwise",
+            cpp_kernel_name="mkldnn::_convolution_transpose_pointwise",
         )
         self.cpp_kernel_key = "convolution_transpose_pointwise"
         self.cpp_op_schema = """
@@ -5646,7 +5646,7 @@ def __init__(
             constant_args,
             None,
             kernel="aten.mkldnn_rnn_layer",
-            cpp_kernel="at::mkldnn_rnn_layer",
+            cpp_kernel_name="at::mkldnn_rnn_layer",
         )
 
     @classmethod
@@ -5766,7 +5766,7 @@ def __init__(
             constant_args,
             None,
             kernel="torch.ops.onednn.qconv2d_pointwise",
-            cpp_kernel="onednn::qconv2d_pointwise",
+            cpp_kernel_name="onednn::qconv2d_pointwise",
         )
         self.cpp_kernel_key = "qconv2d_pointwise"
         self.cpp_op_schema = """
@@ -5936,7 +5936,7 @@ def __init__(
             constant_args,
             None,
             kernel="torch.ops.onednn.qconv2d_pointwise.binary",
-            cpp_kernel="onednn::qconv2d_pointwise",
+            cpp_kernel_name="onednn::qconv2d_pointwise",
         )
         self.cpp_kernel_overload_name = "binary"
         self.cpp_kernel_key = "qconv2d_pointwise_binary"
@@ -6136,7 +6136,7 @@ def __init__(
             constant_args,
             None,
             kernel="torch.ops.onednn.qlinear_pointwise",
-            cpp_kernel="onednn::qlinear_pointwise",
+            cpp_kernel_name="onednn::qlinear_pointwise",
         )
         self.cpp_kernel_key = "qlinear_pointwise"
         self.cpp_op_schema = """
@@ -7223,10 +7223,10 @@ def has_side_effects(self):
     def set_cpp_kernel(self, kernel):
         from .codegen.wrapper import get_cpp_op_schema
 
-        self.cpp_kernel = kernel._schema.name
+        self.cpp_kernel_name = kernel._schema.name
         self.cpp_kernel_overload_name = kernel._schema.overload_name
         self.cpp_kernel_key = (
-            f"{self.cpp_kernel.replace('::', '_')}_{self.cpp_kernel_overload_name}"
+            f"{self.cpp_kernel_name.replace('::', '_')}_{self.cpp_kernel_overload_name}"
         )
 
         self.cpp_op_schema = get_cpp_op_schema(kernel)

torch/_inductor/select_algorithm.py

@@ -559,7 +559,7 @@ def __init__(
         assert callable(kernel)
         assert not hasattr(extern_kernels, name), "duplicate extern kernel"
         self.name = name
-        self.cpp_kernel = cpp_kernel
+        self.cpp_kernel_name = cpp_kernel
         self.has_out_variant = has_out_variant
         setattr(extern_kernels, name, kernel)
 
@@ -687,7 +687,7 @@ def output_node(self):
                 layout=self.layout,
                 inputs=self.input_nodes,
                 kernel=self.choice.call_name(),
-                cpp_kernel=self.choice.cpp_kernel,
+                cpp_kernel_name=self.choice.cpp_kernel_name,
                 ordered_kwargs_for_cpp_kernel=self.choice.ordered_kwargs_for_cpp_kernel,
                 kwargs=self.kwargs,
             )