[stdlib] Refactor external_call() and inline _LITRefPackHelper into VariadicPack

stdlib/src/builtin/builtin_list.mojo

@@ -463,23 +463,30 @@ struct VariadicListMem[
 
 
 # ===----------------------------------------------------------------------===#
-# _LITRefPackHelper
+# VariadicPack
 # ===----------------------------------------------------------------------===#
 
 
 alias _AnyTypeMetaType = __mlir_type[`!lit.anytrait<`, AnyType, `>`]
 
 
-@value
-struct _LITRefPackHelper[
-    is_mutable: Bool, //,
-    lifetime: Lifetime[is_mutable].type,
-    address_space: __mlir_type.index,
+@register_passable
+struct VariadicPack[
+    elt_is_mutable: __mlir_type.i1, //,
+    lifetime: Lifetime[Bool {value: elt_is_mutable}].type,
     element_trait: _AnyTypeMetaType,
     *element_types: element_trait,
-]:
-    """This struct mirrors the !lit.ref.pack type, and provides aliases and
-    methods that are useful for working with it."""
+](Sized):
+    """A utility class to access variadic pack  arguments and provide an API for
+    doing things with them.
+
+    Parameters:
+        elt_is_mutable: True if the elements of the list are mutable for an
+                        inout or owned argument pack.
+        lifetime: The reference lifetime of the underlying elements.
+        element_trait: The trait that each element of the pack conforms to.
+        element_types: The list of types held by the argument pack.
+    """
 
     alias _mlir_type = __mlir_type[
         `!lit.ref.pack<:variadic<`,
@@ -488,89 +495,42 @@ struct _LITRefPackHelper[
         element_types,
         `, `,
         lifetime,
-        `, `,
-        address_space,
         `>`,
     ]
 
-    var storage: Self._mlir_type
+    var _value: Self._mlir_type
+    var _is_owned: Bool
 
-    # This is the element_types list lowered to `variadic<type>` type for kgen.
     alias _kgen_element_types = rebind[
         __mlir_type.`!kgen.variadic<!kgen.type>`
     ](Self.element_types)
-
-    # Use variadic_ptr_map to construct the type list of the !kgen.pack that the
-    # !lit.ref.pack will lower to.  It exposes the pointers introduced by the
-    # references.
+    """This is the element_types list lowered to `variadic<type>` type for kgen.
+    """
     alias _variadic_pointer_types = __mlir_attr[
         `#kgen.param.expr<variadic_ptr_map, `,
         Self._kgen_element_types,
         `, 0: index>: !kgen.variadic<!kgen.type>`,
     ]
-
-    # This is the !kgen.pack type with pointer elements.
-    alias kgen_pack_with_pointer_type = __mlir_type[
+    """Use variadic_ptr_map to construct the type list of the !kgen.pack that
+    the !lit.ref.pack will lower to.  It exposes the pointers introduced by the
+    references.
+    """
+    alias _kgen_pack_with_pointer_type = __mlir_type[
         `!kgen.pack<:variadic<type> `, Self._variadic_pointer_types, `>`
     ]
-
-    # This rebinds `in_pack` to the equivalent `!kgen.pack` with kgen pointers.
-    fn get_as_kgen_pack(self) -> Self.kgen_pack_with_pointer_type:
-        return rebind[Self.kgen_pack_with_pointer_type](self.storage)
-
+    """This is the !kgen.pack type with pointer elements."""
     alias _variadic_with_pointers_removed = __mlir_attr[
         `#kgen.param.expr<variadic_ptrremove_map, `,
         Self._variadic_pointer_types,
         `>: !kgen.variadic<!kgen.type>`,
     ]
-
-    # This is the `!kgen.pack` type that happens if one loads all the elements
-    # of the pack.
-    alias loaded_kgen_pack_type = __mlir_type[
+    alias _loaded_kgen_pack_type = __mlir_type[
         `!kgen.pack<:variadic<type> `, Self._variadic_with_pointers_removed, `>`
     ]
-
-    # This returns the stored KGEN pack after loading all of the elements.
-    fn get_loaded_kgen_pack(self) -> Self.loaded_kgen_pack_type:
-        return __mlir_op.`kgen.pack.load`(self.get_as_kgen_pack())
-
-
-# ===----------------------------------------------------------------------===#
-# VariadicPack
-# ===----------------------------------------------------------------------===#
-
-
-@register_passable
-struct VariadicPack[
-    elt_is_mutable: __mlir_type.i1, //,
-    lifetime: Lifetime[Bool {value: elt_is_mutable}].type,
-    element_trait: _AnyTypeMetaType,
-    *element_types: element_trait,
-](Sized):
-    """A utility class to access variadic pack  arguments and provide an API for
-    doing things with them.
-
-    Parameters:
-        elt_is_mutable: True if the elements of the list are mutable for an
-                        inout or owned argument pack.
-        lifetime: The reference lifetime of the underlying elements.
-        element_trait: The trait that each element of the pack conforms to.
-        element_types: The list of types held by the argument pack.
+    """This is the `!kgen.pack` type that happens if one loads all the elements
+    of the pack.
     """
 
-    alias _mlir_type = __mlir_type[
-        `!lit.ref.pack<:variadic<`,
-        element_trait,
-        `> `,
-        element_types,
-        `, `,
-        lifetime,
-        `>`,
-    ]
-
-    var _value: Self._mlir_type
-    var _is_owned: Bool
-
     # ===-------------------------------------------------------------------===#
     # Life cycle methods
     # ===-------------------------------------------------------------------===#
@@ -690,3 +650,11 @@ struct VariadicPack[
         @parameter
         for i in range(Self.__len__()):
             func[i](self[i])
+
+    @always_inline("nodebug")
+    fn _get_loaded_kgen_pack(self) -> Self._loaded_kgen_pack_type:
+        """This returns the stored KGEN pack after loading all of the elements.
+        """
+        return __mlir_op.`kgen.pack.load`(
+            rebind[Self._kgen_pack_with_pointer_type](self._value)
+        )

stdlib/src/builtin/io.mojo

@@ -23,9 +23,8 @@ from sys import (
     _libc as libc,
 )
 from sys._libc import dup, fclose, fdopen, fflush
-from sys.ffi import OpaquePointer
+from sys.ffi import OpaquePointer, char_ptr
 
-from builtin.builtin_list import _LITRefPackHelper
 from builtin.dtype import _get_dtype_printf_format
 from builtin.file_descriptor import FileDescriptor
 from memory import UnsafePointer
@@ -158,19 +157,16 @@ fn _flush(file: FileDescriptor = stdout):
 @no_inline
 fn _printf[
     fmt: StringLiteral, *types: AnyType
-](*arguments: *types, file: FileDescriptor = stdout):
-    # The argument pack will contain references for each value in the pack,
-    # but we want to pass their values directly into the C printf call. Load
-    # all the members of the pack.
-    var loaded_pack = _LITRefPackHelper(arguments._value).get_loaded_kgen_pack()
+](*args: *types, file: FileDescriptor = stdout):
+    var loaded_pack = args._get_loaded_kgen_pack()
+    var f = char_ptr(fmt)
 
     @parameter
     if triple_is_nvidia_cuda():
-        _ = external_call["vprintf", Int32](
-            fmt.unsafe_cstr_ptr(), Pointer.address_of(loaded_pack)
-        )
+        _ = external_call["vprintf", Int32](f, Pointer.address_of(loaded_pack))
     else:
         with _fdopen(file) as fd:
+            # FIXME: externall_call should handle this
             _ = __mlir_op.`pop.external_call`[
                 func = "KGEN_CompilerRT_fprintf".value,
                 variadicType = __mlir_attr[
@@ -180,7 +176,7 @@ fn _printf[
                     `) -> !pop.scalar<si32>`,
                 ],
                 _type=Int32,
-            ](fd, fmt.unsafe_cstr_ptr(), loaded_pack)
+            ](fd, f, loaded_pack)
 
 
 # ===----------------------------------------------------------------------=== #
@@ -191,7 +187,7 @@ fn _printf[
 @no_inline
 fn _snprintf[
     fmt: StringLiteral, *types: AnyType
-](str: UnsafePointer[UInt8], size: Int, *arguments: *types) -> Int:
+](str: UnsafePointer[UInt8], size: Int, *args: *types) -> Int:
     """Writes a format string into an output pointer.
 
     Parameters:
@@ -201,29 +197,24 @@ fn _snprintf[
     Args:
         str: A pointer into which the format string is written.
         size: At most, `size - 1` bytes are written into the output string.
-        arguments: Arguments interpolated into the format string.
+        args: Arguments interpolated into the format string.
 
     Returns:
         The number of bytes written into the output string.
     """
-    # The argument pack will contain references for each value in the pack,
-    # but we want to pass their values directly into the C snprintf call. Load
-    # all the members of the pack.
-    var loaded_pack = _LITRefPackHelper(arguments._value).get_loaded_kgen_pack()
-
-    return int(
-        __mlir_op.`pop.external_call`[
-            func = "snprintf".value,
-            variadicType = __mlir_attr[
-                `(`,
-                `!kgen.pointer<scalar<si8>>,`,
-                `!pop.scalar<index>, `,
-                `!kgen.pointer<scalar<si8>>`,
-                `) -> !pop.scalar<si32>`,
-            ],
-            _type=Int32,
-        ](str, size, fmt.unsafe_cstr_ptr(), loaded_pack)
-    )
+    # FIXME: externall_call should handle this
+    var num = __mlir_op.`pop.external_call`[
+        func = "snprintf".value,
+        variadicType = __mlir_attr[
+            `(`,
+            `!kgen.pointer<scalar<si8>>,`,
+            `!pop.scalar<index>, `,
+            `!kgen.pointer<scalar<si8>>`,
+            `) -> !pop.scalar<si32>`,
+        ],
+        _type=Int32,
+    ](char_ptr(str), size, char_ptr(fmt), args._get_loaded_kgen_pack())
+    return int(num)
 
 
 @no_inline

stdlib/src/sys/_assembly.mojo

@@ -13,7 +13,6 @@
 """This module includes the inlined_assembly function."""
 
 from sys.intrinsics import _mlirtype_is_eq
-from builtin.builtin_list import _LITRefPackHelper
 
 # ===----------------------------------------------------------------------===#
 # 0-arg
@@ -27,9 +26,9 @@ fn inlined_assembly[
     *types: AnyType,
     constraints: StringLiteral,
     has_side_effect: Bool = True,
-](*arguments: *types) -> result_type:
+](*args: *types) -> result_type:
     """Generates assembly via inline assembly."""
-    var loaded_pack = _LITRefPackHelper(arguments._value).get_loaded_kgen_pack()
+    var loaded_pack = args._get_loaded_kgen_pack()
 
     @parameter
     if _mlirtype_is_eq[result_type, NoneType]():