Skip to content
Merged
Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
f4fdbf2
gh-102471: Add PyLong import and export API
vstinner Jul 2, 2024
c2e568e
Add layout
vstinner Jul 23, 2024
f0d9525
Merge branch 'main' into long_export
vstinner Sep 3, 2024
b19764f
Rename word_endian to digits_order
vstinner Sep 3, 2024
6f7fd11
Replace Py_digit* type with void*
vstinner Sep 3, 2024
080e079
Add PyLongWriter_Discard() function
vstinner Sep 4, 2024
1a7902f
Fixes
vstinner Sep 5, 2024
b70a6dd
Use unsigned type for ndigits
vstinner Sep 5, 2024
07552a7
Remove again layout
vstinner Sep 5, 2024
0d0f942
Revert "Use unsigned type for ndigits"
vstinner Sep 6, 2024
762c33a
doc: adjust ndigits documentation
vstinner Sep 6, 2024
20be7a3
Update doc
vstinner Sep 13, 2024
d92bf1e
Make PyLong_DigitArray.obj private
vstinner Sep 16, 2024
b3b02a2
Remove reserved documentation
vstinner Sep 16, 2024
caca2d7
PyLong_FreeDigitArray() only clears _reserved
vstinner Sep 16, 2024
4221a49
Make PyLong_LAYOUT static
vstinner Sep 16, 2024
37b1d49
Add PyLong_AsDigitArray.value
vstinner Sep 16, 2024
d70a121
Inline PyLong_AsInt64() to avoid the exception
vstinner Sep 17, 2024
4aa25f6
Remove Py_digit type; update the doc
vstinner Sep 17, 2024
90973d4
Merge branch 'main' into long_export
vstinner Sep 17, 2024
5d3e224
Add long_asnativebytes() function
vstinner Sep 17, 2024
c7d7cb2
Remove reference to removed Py_digit type
vstinner Sep 17, 2024
a3d601a
Address Antoine's review
vstinner Sep 17, 2024
c049268
Merge branch 'main' into long_export
vstinner Sep 17, 2024
06b196b
Merge branch 'main' into long_export
skirpichev Sep 18, 2024
3e8d296
Apply suggestions from code review
skirpichev Sep 18, 2024
86c68c2
Merge branch 'main' into long_export
skirpichev Sep 18, 2024
a8fd669
Revert "Add long_asnativebytes() function"
vstinner Sep 18, 2024
a04f9d0
Use PyLong_AsLongAndOverflow()
vstinner Sep 18, 2024
b2be94a
Try PyLong_AsLongLongAndOverflow() first
vstinner Sep 18, 2024
ca98ad1
Merge branch 'main' into long_export
vstinner Sep 18, 2024
167d75e
Update Doc/c-api/long.rst
vstinner Sep 19, 2024
5e53a5b
Sync implementation with PEP (#8)
skirpichev Oct 16, 2024
c24789f
Merge branch 'main' into long_export
skirpichev Nov 13, 2024
0422f9d
fix NL in Doc/c-api/long.rst (sorry, damn web editor)
skirpichev Nov 13, 2024
a529a48
rename news
skirpichev Nov 13, 2024
3db44f3
Address Erlend's review
vstinner Nov 13, 2024
1d2863e
Address Sergey's review
vstinner Nov 13, 2024
d663511
Merge branch 'main' into long_export
vstinner Nov 13, 2024
816798d
Merge branch 'main' into long_export
vstinner Nov 28, 2024
033bd65
Update documentation from PEP 757
vstinner Nov 28, 2024
36b87d4
Update Modules/_testcapi/long.c
vstinner Nov 28, 2024
94d852e
Sync implementation with PEP (#9)
skirpichev Dec 9, 2024
a72ff83
Merge branch 'main' into long_export
vstinner Dec 9, 2024
53d584b
Cleanup
vstinner Dec 9, 2024
577598a
Update Doc/c-api/long.rst
vstinner Dec 9, 2024
b08cd55
Address Steve's review
vstinner Dec 9, 2024
eaebef3
Address Bénédikt's review
vstinner Dec 10, 2024
03248c7
Apply suggestions from code review
vstinner Dec 10, 2024
0a26f97
Address Steve's review
vstinner Dec 11, 2024
88a62fe
Add PyLong_Export to Doc/data/refcounts.dat
vstinner Dec 12, 2024
45517ab
Address Serhiy's review
vstinner Dec 12, 2024
92007d1
Address Petr's review
vstinner Dec 12, 2024
6d3cb80
Add PyLongWriter to Doc/data/refcounts.dat
vstinner Dec 12, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
162 changes: 162 additions & 0 deletions Doc/c-api/long.rst
Original file line number Diff line number Diff line change
Expand Up @@ -597,10 +597,172 @@ distinguished from a number. Use :c:func:`PyErr_Occurred` to disambiguate.
Exactly what values are considered compact is an implementation detail
and is subject to change.

.. versionadded:: 3.12


.. c:function:: Py_ssize_t PyUnstable_Long_CompactValue(const PyLongObject* op)

If *op* is compact, as determined by :c:func:`PyUnstable_Long_IsCompact`,
return its value.

Otherwise, the return value is undefined.

.. versionadded:: 3.12


Export API
^^^^^^^^^^

.. versionadded:: 3.14

.. c:type:: Py_digit

A single unsigned digit in the range [``0``; ``PyLong_BASE - 1``].

It is usually used in an *array of digits*, such as the
:c:member:`PyLong_DigitArray.digits` array.

Its size depend on the :c:macro:`!PYLONG_BITS_IN_DIGIT` macro:
see the ``configure`` :option:`--enable-big-digits` option.

See :c:member:`PyLongLayout.bits_per_digit` for the number of bits per
digit and :c:member:`PyLongLayout.digit_size` for the size of a digit (in
bytes).


.. c:struct:: PyLongLayout

Layout of an array of digits, used by Python :class:`int` object.

Use :c:func:`PyLong_GetNativeLayout` to get the native layout of Python
:class:`int` objects.

See also :attr:`sys.int_info` which exposes similar information to Python.

.. c:member:: uint8_t bits_per_digit

Bits per digit.

.. c:member:: uint8_t digit_size

Digit size in bytes.

.. c:member:: int8_t digits_order

Word endian:

- ``1`` for most significant word first (big endian)
- ``-1`` for least significant first (little endian)

.. c:member:: int8_t endian

Array endian:

- ``1`` for most significant byte first (big endian)
- ``-1`` for least significant first (little endian)


.. c:function:: const PyLongLayout* PyLong_GetNativeLayout(void)

Get the native layout of Python :class:`int` objects.

See the :c:struct:`PyLongLayout` structure.


.. c:struct:: PyLong_DigitArray

A Python :class:`int` object exported as an array of digits.

.. c:member:: int negative

1 if the number is negative, 0 otherwise.

.. c:member:: Py_ssize_t ndigits

Number of digits in :c:member:`digits` array.

.. c:member:: const void *digits

Read-only array of unsigned digits.


.. c:function:: int PyLong_AsDigitArray(PyObject *obj, PyLong_DigitArray *array)

Export a Python :class:`int` object as an array of digits.

On success, set *\*array* and return 0.
On error, set an exception and return -1.

This function always succeeds if *obj* is a Python :class:`int` object or a
subclass.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@vstinner, after some thinking I believe we should drop this contract, if we take into account future changes in internals of CPython's integers. If single layout view will be invalid - this function, probably, will allocate temporary buffers. That might fail.

Can we offer a different contract instead, something like this: "This function always succeeds if obj is a Python int object or a subclass and it's value can't be converted to C long."? In this case users have a clear hint: "try something like PyLong_AsLongAndOverflow and if it fails - fallback to this function". If not, I think this is a severe issue with that part of API.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No fallback to PyLong_AsLongAndOverflow should be needed with this API, thanks to the embedded int64_t value.


:c:func:`PyLong_FreeDigitArray` must be called once done with using
*array*.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
.. impl-detail::
This function always succeeds if *obj* is a Python :class:`int` object
or a subclass.

Lets see if we can restore this in a that way. It might be helpful for e.g. Sage, which doesn't support PyPy.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would prefer to not add this note. It was controversial during PEP 757 design.

@serhiy-storchaka @encukou: What do you think? Would you be ok to declare that the PyLong_Export() function cannot fail if the argument is a Python int?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It was controversial during PEP 757 design.

It was proposed unconditionally, not as CPython's implementation detail.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm fine with it, as an implementation detail.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


.. c:function:: void PyLong_FreeDigitArray(PyLong_DigitArray *array)

Release the export *array* created by :c:func:`PyLong_AsDigitArray`.


PyLongWriter API
^^^^^^^^^^^^^^^^

The :c:type:`PyLongWriter` API can be used to import an integer.

.. versionadded:: 3.14

.. c:struct:: PyLongWriter

A Python :class:`int` writer instance.

The instance must be destroyed by :c:func:`PyLongWriter_Finish`.


.. c:function:: PyLongWriter* PyLongWriter_Create(int negative, Py_ssize_t ndigits, void **digits)

Create a :c:type:`PyLongWriter`.

On success, set *\*digits* and return a writer.
On error, set an exception and return ``NULL``.

*negative* is ``1`` if the number is negative, or ``0`` otherwise.

*ndigits* is the number of digits in the *digits* array. It must be
greater than or equal to 0.

The caller must initialize the array of digits *digits* and then call
:c:func:`PyLongWriter_Finish` to get a Python :class:`int`. Digits must be
in the range [``0``; ``PyLong_BASE - 1``]. Unused digits must be set to
``0``.


.. c:function:: PyObject* PyLongWriter_Finish(PyLongWriter *writer)

Finish a :c:type:`PyLongWriter` created by :c:func:`PyLongWriter_Create`.

On success, return a Python :class:`int` object.
On error, set an exception and return ``NULL``.


.. c:function:: void PyLongWriter_Discard(PyLongWriter *writer)

Discard the internal object and destroy the writer instance.


Example creating an integer from an array of digits::

PyObject *
long_import(int negative, Py_ssize_t ndigits, Py_digit *digits)
{
void *writer_digits;
PyLongWriter *writer = PyLongWriter_Create(negative, ndigits,
&writer_digits);
if (writer == NULL) {
return NULL;
}

assert(layout.digit_size == sizeof(Py_digit));
memcpy(writer_digits, digits, ndigits * sizeof(Py_digit));
return PyLongWriter_Finish(writer);
}
2 changes: 2 additions & 0 deletions Doc/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,8 @@
('c:type', 'size_t'),
('c:type', 'ssize_t'),
('c:type', 'time_t'),
('c:type', 'int8_t'),
('c:type', 'uint8_t'),
('c:type', 'uint32_t'),
('c:type', 'uint64_t'),
('c:type', 'uintmax_t'),
Expand Down
3 changes: 2 additions & 1 deletion Doc/using/configure.rst
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,8 @@ General Options

Define the ``PYLONG_BITS_IN_DIGIT`` to ``15`` or ``30``.

See :data:`sys.int_info.bits_per_digit <sys.int_info>`.
See :data:`sys.int_info.bits_per_digit <sys.int_info>` and the
:c:type:`Py_digit` type.

.. option:: --with-suffix=SUFFIX

Expand Down
11 changes: 11 additions & 0 deletions Doc/whatsnew/3.14.rst
Original file line number Diff line number Diff line change
Expand Up @@ -528,6 +528,17 @@ New Features

(Contributed by Victor Stinner in :gh:`107954`.)

* Add a new import and export API for Python :class:`int` objects:

* :c:func:`PyLong_GetNativeLayout`;
* :c:func:`PyLong_AsDigitArray`;
* :c:func:`PyLong_FreeDigitArray`;
* :c:func:`PyLongWriter_Create`;
* :c:func:`PyLongWriter_Finish`;
* :c:func:`PyLongWriter_Discard`.

(Contributed by Victor Stinner in :gh:`102471`.)


Porting to Python 3.14
----------------------
Expand Down
54 changes: 52 additions & 2 deletions Include/cpython/longintrepr.h
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,10 @@ typedef long stwodigits; /* signed variant of twodigits */
#else
#error "PYLONG_BITS_IN_DIGIT should be 15 or 30"
#endif
#define PyLong_BASE ((digit)1 << PyLong_SHIFT)
#define PyLong_MASK ((digit)(PyLong_BASE - 1))
#define PyLong_BASE ((Py_digit)1 << PyLong_SHIFT)
#define PyLong_MASK ((Py_digit)(PyLong_BASE - 1))

typedef digit Py_digit;

/* Long integer representation.

Expand Down Expand Up @@ -139,6 +141,54 @@ _PyLong_CompactValue(const PyLongObject *op)
#define PyUnstable_Long_CompactValue _PyLong_CompactValue


/* --- Import/Export API -------------------------------------------------- */

typedef struct PyLongLayout {
// Bits per digit
uint8_t bits_per_digit;

// Digit size in bytes
uint8_t digit_size;

// Word endian:
// * 1 for most significant word first (big endian)
// * -1 for least significant first (little endian)
int8_t digits_order;

// Array endian:
// * 1 for most significant byte first (big endian)
// * -1 for least significant first (little endian)
int8_t endian;
} PyLongLayout;

PyAPI_FUNC(const PyLongLayout*) PyLong_GetNativeLayout(void);

typedef struct PyLong_DigitArray {
int negative;
Py_ssize_t ndigits;
const void *digits;
// Member used internally, must not be used for other purpose.
Py_uintptr_t _reserved;
} PyLong_DigitArray;

PyAPI_FUNC(int) PyLong_AsDigitArray(
PyObject *obj,
PyLong_DigitArray *array);
PyAPI_FUNC(void) PyLong_FreeDigitArray(
PyLong_DigitArray *array);


/* --- PyLongWriter API --------------------------------------------------- */

typedef struct PyLongWriter PyLongWriter;

PyAPI_FUNC(PyLongWriter*) PyLongWriter_Create(
int negative,
Py_ssize_t ndigits,
void **digits);
PyAPI_FUNC(PyObject*) PyLongWriter_Finish(PyLongWriter *writer);
PyAPI_FUNC(void) PyLongWriter_Discard(PyLongWriter *writer);

#ifdef __cplusplus
}
#endif
Expand Down
68 changes: 68 additions & 0 deletions Lib/test/test_capi/test_long.py
Original file line number Diff line number Diff line change
Expand Up @@ -669,5 +669,73 @@ def test_long_asuint64(self):
self.check_long_asint(as_uint64, 0, UINT64_MAX,
negative_value_error=ValueError)

def test_long_layout(self):
# Test PyLong_GetNativeLayout()
int_info = sys.int_info
layout = _testcapi.get_pylong_layout()
expected = {
'bits_per_digit': int_info.bits_per_digit,
'digit_size': int_info.sizeof_digit,
'digits_order': -1,
'endian': -1 if sys.byteorder == 'little' else 1,
}
self.assertEqual(layout, expected)

def test_long_export(self):
# Test PyLong_Export()
layout = _testcapi.get_pylong_layout()
base = 2 ** layout['bits_per_digit']

pylong_asdigitarray = _testcapi.pylong_asdigitarray
self.assertEqual(pylong_asdigitarray(0), (0, [0]))
self.assertEqual(pylong_asdigitarray(123), (0, [123]))
self.assertEqual(pylong_asdigitarray(-123), (1, [123]))
self.assertEqual(pylong_asdigitarray(base**2 * 3 + base * 2 + 1),
(0, [1, 2, 3]))

with self.assertRaises(TypeError):
pylong_asdigitarray(1.0)
with self.assertRaises(TypeError):
pylong_asdigitarray(0+1j)
with self.assertRaises(TypeError):
pylong_asdigitarray("abc")

def test_longwriter_create(self):
# Test PyLong_Import()
layout = _testcapi.get_pylong_layout()
base = 2 ** layout['bits_per_digit']

pylongwriter_create = _testcapi.pylongwriter_create
self.assertEqual(pylongwriter_create(0, []), 0)
self.assertEqual(pylongwriter_create(0, [0]), 0)
self.assertEqual(pylongwriter_create(0, [123]), 123)
self.assertEqual(pylongwriter_create(1, [123]), -123)
self.assertEqual(pylongwriter_create(1, [1, 2]),
-(base * 2 + 1))
self.assertEqual(pylongwriter_create(0, [1, 2, 3]),
base**2 * 3 + base * 2 + 1)
max_digit = base - 1
self.assertEqual(pylongwriter_create(0, [max_digit, max_digit, max_digit]),
base**2 * max_digit + base * max_digit + max_digit)

# normalize
self.assertEqual(pylongwriter_create(0, [123, 0, 0]), 123)

# test singletons + normalize
for num in (-2, 0, 1, 5, 42, 100):
self.assertIs(pylongwriter_create(bool(num < 0), [abs(num), 0]),
num)

# round trip: Python int -> export -> Python int
pylong_asdigitarray = _testcapi.pylong_asdigitarray
numbers = [*range(0, 10), 12345, 0xdeadbeef, 2**100, 2**100-1]
numbers.extend(-num for num in list(numbers))
for num in numbers:
with self.subTest(num=num):
negative, digits = pylong_asdigitarray(num)
self.assertEqual(pylongwriter_create(negative, digits), num,
(negative, digits))


if __name__ == "__main__":
unittest.main()
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
Add a new import and export API for Python :class:`int` objects:

* :c:func:`PyLong_GetNativeLayout`;
* :c:func:`PyLong_AsDigitArray`;
* :c:func:`PyLong_FreeDigitArray`;
* :c:func:`PyLongWriter_Create`;
* :c:func:`PyLongWriter_Finish`;
* :c:func:`PyLongWriter_Discard`.

Patch by Victor Stinner.
Loading
Loading