mirror of
https://github.com/llvm/llvm-project.git
synced 2025-04-25 01:36:06 +00:00

In addition to changes in the tables the extended grapheme clustering algorithm has been overhauled. Before I considered a separate state machine to implement the rules. With the new rule GB9c this became more attractive and the design has changed. This change initially had quite an impact on the performance. By making the state machine persistent the performance was improved greatly. Note it is still slower than before due to the larger Unicode tables. Before -------------------------------------------------------------------- Benchmark Time CPU Iterations -------------------------------------------------------------------- BM_ascii_text<char> 1891 ns 1889 ns 369504 BM_unicode_text<char> 106642 ns 106397 ns 6576 BM_cyrillic_text<char> 73420 ns 73277 ns 9445 BM_japanese_text<char> 62485 ns 62387 ns 11153 BM_emoji_text<char> 1895 ns 1893 ns 369525 BM_ascii_text<wchar_t> 2015 ns 2013 ns 346887 BM_unicode_text<wchar_t> 92119 ns 92017 ns 7598 BM_cyrillic_text<wchar_t> 62637 ns 62568 ns 11117 BM_japanese_text<wchar_t> 53850 ns 53785 ns 12803 BM_emoji_text<wchar_t> 2016 ns 2014 ns 347325 After -------------------------------------------------------------------- Benchmark Time CPU Iterations -------------------------------------------------------------------- BM_ascii_text<char> 1906 ns 1904 ns 369409 BM_unicode_text<char> 265462 ns 265175 ns 2628 BM_cyrillic_text<char> 181063 ns 180865 ns 3871 BM_japanese_text<char> 130927 ns 130789 ns 5324 BM_emoji_text<char> 1892 ns 1890 ns 370537 BM_ascii_text<wchar_t> 2038 ns 2035 ns 343689 BM_unicode_text<wchar_t> 277603 ns 277282 ns 2526 BM_cyrillic_text<wchar_t> 188558 ns 188339 ns 3727 BM_japanese_text<wchar_t> 133084 ns 132943 ns 5262 BM_emoji_text<wchar_t> 2012 ns 2010 ns 348015 Persistent -------------------------------------------------------------------- Benchmark Time CPU Iterations -------------------------------------------------------------------- BM_ascii_text<char> 1904 ns 1899 ns 367472 BM_unicode_text<char> 133609 ns 133287 ns 5246 BM_cyrillic_text<char> 90185 ns 89941 ns 7796 BM_japanese_text<char> 75137 ns 74946 ns 9316 BM_emoji_text<char> 1906 ns 1901 ns 368081 BM_ascii_text<wchar_t> 2703 ns 2696 ns 259153 BM_unicode_text<wchar_t> 131497 ns 131168 ns 5341 BM_cyrillic_text<wchar_t> 87071 ns 86840 ns 8076 BM_japanese_text<wchar_t> 72279 ns 72099 ns 9682 BM_emoji_text<wchar_t> 2021 ns 2016 ns 346767
310 lines
11 KiB
Python
Executable File
310 lines
11 KiB
Python
Executable File
#!/usr/bin/env python
|
|
# ===----------------------------------------------------------------------===##
|
|
#
|
|
# Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
|
|
# See https://llvm.org/LICENSE.txt for license information.
|
|
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
|
|
#
|
|
# ===----------------------------------------------------------------------===##
|
|
|
|
# The code is based on
|
|
# https://github.com/microsoft/STL/blob/main/tools/unicode_properties_parse/grapheme_break_property_data_gen.py
|
|
#
|
|
# Copyright (c) Microsoft Corporation.
|
|
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
|
|
|
|
from io import StringIO
|
|
from pathlib import Path
|
|
from dataclasses import dataclass
|
|
from typing import Optional
|
|
import re
|
|
import sys
|
|
|
|
|
|
@dataclass
|
|
class PropertyRange:
|
|
lower: int = -1
|
|
upper: int = -1
|
|
prop: str = None
|
|
|
|
|
|
@dataclass
|
|
class Entry:
|
|
lower: int = -1
|
|
offset: int = -1
|
|
prop: int = -1
|
|
|
|
|
|
LINE_REGEX = re.compile(
|
|
r"^(?P<lower>[0-9A-F]{4,5})(?:\.\.(?P<upper>[0-9A-F]{4,5}))?\s*;\s*InCB;\s*(?P<prop>\w+)"
|
|
)
|
|
|
|
def parsePropertyLine(inputLine: str) -> Optional[PropertyRange]:
|
|
result = PropertyRange()
|
|
if m := LINE_REGEX.match(inputLine):
|
|
lower_str, upper_str, result.prop = m.group("lower", "upper", "prop")
|
|
result.lower = int(lower_str, base=16)
|
|
result.upper = result.lower
|
|
if upper_str is not None:
|
|
result.upper = int(upper_str, base=16)
|
|
return result
|
|
|
|
else:
|
|
return None
|
|
|
|
|
|
|
|
def compactPropertyRanges(input: list[PropertyRange]) -> list[PropertyRange]:
|
|
"""
|
|
Merges consecutive ranges with the same property to one range.
|
|
|
|
Merging the ranges results in fewer ranges in the output table,
|
|
reducing binary and improving lookup performance.
|
|
"""
|
|
result = list()
|
|
for x in input:
|
|
if (
|
|
len(result)
|
|
and result[-1].prop == x.prop
|
|
and result[-1].upper + 1 == x.lower
|
|
):
|
|
result[-1].upper = x.upper
|
|
continue
|
|
result.append(x)
|
|
return result
|
|
|
|
|
|
PROP_VALUE_ENUMERATOR_TEMPLATE = " __{}"
|
|
PROP_VALUE_ENUM_TEMPLATE = """
|
|
enum class __property : uint8_t {{
|
|
// Values generated from the data files.
|
|
{enumerators},
|
|
|
|
// The code unit has none of above properties.
|
|
__none
|
|
}};
|
|
"""
|
|
|
|
DATA_ARRAY_TEMPLATE = """
|
|
/// The entries of the indic conjunct break property table.
|
|
///
|
|
/// The data is generated from
|
|
/// - https://www.unicode.org/Public/UCD/latest/ucd/DerivedCoreProperties.txt
|
|
///
|
|
/// The data has 3 values
|
|
/// - bits [0, 1] The property. One of the values generated from the datafiles
|
|
/// of \\ref __property
|
|
/// - bits [2, 10] The size of the range.
|
|
/// - bits [11, 31] The lower bound code point of the range. The upper bound of
|
|
/// the range is lower bound + size.
|
|
///
|
|
/// The 9 bits for the size allow a maximum range of 512 elements. Some ranges
|
|
/// in the Unicode tables are larger. They are stored in multiple consecutive
|
|
/// ranges in the data table. An alternative would be to store the sizes in a
|
|
/// separate 16-bit value. The original MSVC STL code had such an approach, but
|
|
/// this approach uses less space for the data and is about 4% faster in the
|
|
/// following benchmark.
|
|
/// libcxx/benchmarks/std_format_spec_string_unicode.bench.cpp
|
|
// clang-format off
|
|
_LIBCPP_HIDE_FROM_ABI inline constexpr uint32_t __entries[{size}] = {{
|
|
{entries}}};
|
|
// clang-format on
|
|
|
|
/// Returns the indic conjuct break property of a code point.
|
|
[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr __property __get_property(const char32_t __code_point) noexcept {{
|
|
// The algorithm searches for the upper bound of the range and, when found,
|
|
// steps back one entry. This algorithm is used since the code point can be
|
|
// anywhere in the range. After a lower bound is found the next step is to
|
|
// compare whether the code unit is indeed in the range.
|
|
//
|
|
// Since the entry contains a code unit, size, and property the code point
|
|
// being sought needs to be adjusted. Just shifting the code point to the
|
|
// proper position doesn't work; suppose an entry has property 0, size 1,
|
|
// and lower bound 3. This results in the entry 0x1810.
|
|
// When searching for code point 3 it will search for 0x1800, find 0x1810
|
|
// and moves to the previous entry. Thus the lower bound value will never
|
|
// be found.
|
|
// The simple solution is to set the bits belonging to the property and
|
|
// size. Then the upper bound for code point 3 will return the entry after
|
|
// 0x1810. After moving to the previous entry the algorithm arrives at the
|
|
// correct entry.
|
|
ptrdiff_t __i = std::ranges::upper_bound(__entries, (__code_point << 11) | 0x7ffu) - __entries;
|
|
if (__i == 0)
|
|
return __property::__none;
|
|
|
|
--__i;
|
|
uint32_t __upper_bound = (__entries[__i] >> 11) + ((__entries[__i] >> 2) & 0b1'1111'1111);
|
|
if (__code_point <= __upper_bound)
|
|
return static_cast<__property>(__entries[__i] & 0b11);
|
|
|
|
return __property::__none;
|
|
}}
|
|
"""
|
|
|
|
MSVC_FORMAT_UCD_TABLES_HPP_TEMPLATE = """
|
|
// -*- C++ -*-
|
|
//===----------------------------------------------------------------------===//
|
|
//
|
|
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
|
|
// See https://llvm.org/LICENSE.txt for license information.
|
|
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
// WARNING, this entire header is generated by
|
|
// utils/generate_indic_conjunct_break_table.py
|
|
// DO NOT MODIFY!
|
|
|
|
// UNICODE, INC. LICENSE AGREEMENT - DATA FILES AND SOFTWARE
|
|
//
|
|
// See Terms of Use <https://www.unicode.org/copyright.html>
|
|
// for definitions of Unicode Inc.'s Data Files and Software.
|
|
//
|
|
// NOTICE TO USER: Carefully read the following legal agreement.
|
|
// BY DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING UNICODE INC.'S
|
|
// DATA FILES ("DATA FILES"), AND/OR SOFTWARE ("SOFTWARE"),
|
|
// YOU UNEQUIVOCALLY ACCEPT, AND AGREE TO BE BOUND BY, ALL OF THE
|
|
// TERMS AND CONDITIONS OF THIS AGREEMENT.
|
|
// IF YOU DO NOT AGREE, DO NOT DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE
|
|
// THE DATA FILES OR SOFTWARE.
|
|
//
|
|
// COPYRIGHT AND PERMISSION NOTICE
|
|
//
|
|
// Copyright (c) 1991-2022 Unicode, Inc. All rights reserved.
|
|
// Distributed under the Terms of Use in https://www.unicode.org/copyright.html.
|
|
//
|
|
// Permission is hereby granted, free of charge, to any person obtaining
|
|
// a copy of the Unicode data files and any associated documentation
|
|
// (the "Data Files") or Unicode software and any associated documentation
|
|
// (the "Software") to deal in the Data Files or Software
|
|
// without restriction, including without limitation the rights to use,
|
|
// copy, modify, merge, publish, distribute, and/or sell copies of
|
|
// the Data Files or Software, and to permit persons to whom the Data Files
|
|
// or Software are furnished to do so, provided that either
|
|
// (a) this copyright and permission notice appear with all copies
|
|
// of the Data Files or Software, or
|
|
// (b) this copyright and permission notice appear in associated
|
|
// Documentation.
|
|
//
|
|
// THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
|
|
// ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
|
|
// WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
|
// NONINFRINGEMENT OF THIRD PARTY RIGHTS.
|
|
// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
|
|
// NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
|
|
// DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
|
|
// DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
|
|
// TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
|
|
// PERFORMANCE OF THE DATA FILES OR SOFTWARE.
|
|
//
|
|
// Except as contained in this notice, the name of a copyright holder
|
|
// shall not be used in advertising or otherwise to promote the sale,
|
|
// use or other dealings in these Data Files or Software without prior
|
|
// written authorization of the copyright holder.
|
|
|
|
#ifndef _LIBCPP___FORMAT_INDIC_CONJUNCT_BREAK_TABLE_H
|
|
#define _LIBCPP___FORMAT_INDIC_CONJUNCT_BREAK_TABLE_H
|
|
|
|
#include <__algorithm/ranges_upper_bound.h>
|
|
#include <__config>
|
|
#include <__iterator/access.h>
|
|
#include <cstddef>
|
|
#include <cstdint>
|
|
|
|
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
|
|
# pragma GCC system_header
|
|
#endif
|
|
|
|
_LIBCPP_BEGIN_NAMESPACE_STD
|
|
|
|
#if _LIBCPP_STD_VER >= 20
|
|
|
|
namespace __indic_conjunct_break {{
|
|
{content}
|
|
}} // namespace __indic_conjunct_break
|
|
|
|
#endif //_LIBCPP_STD_VER >= 20
|
|
|
|
_LIBCPP_END_NAMESPACE_STD
|
|
|
|
#endif // _LIBCPP___FORMAT_INDIC_CONJUNCT_BREAK_TABLE_H"""
|
|
|
|
|
|
def property_ranges_to_table(
|
|
ranges: list[PropertyRange], props: list[str]
|
|
) -> list[Entry]:
|
|
assert len(props) < 4
|
|
result = list[Entry]()
|
|
high = -1
|
|
for range in sorted(ranges, key=lambda x: x.lower):
|
|
# Validate overlapping ranges
|
|
assert range.lower > high
|
|
high = range.upper
|
|
|
|
while True:
|
|
e = Entry(range.lower, range.upper - range.lower, props.index(range.prop))
|
|
if e.offset <= 511:
|
|
result.append(e)
|
|
break
|
|
e.offset = 511
|
|
result.append(e)
|
|
range.lower += 512
|
|
return result
|
|
|
|
|
|
cpp_entrytemplate = " 0x{:08x}"
|
|
|
|
|
|
def generate_cpp_data(prop_name: str, ranges: list[PropertyRange]) -> str:
|
|
result = StringIO()
|
|
prop_values = sorted(set(x.prop for x in ranges))
|
|
table = property_ranges_to_table(ranges, prop_values)
|
|
enumerator_values = [PROP_VALUE_ENUMERATOR_TEMPLATE.format(x) for x in prop_values]
|
|
result.write(
|
|
PROP_VALUE_ENUM_TEMPLATE.format(enumerators=",\n".join(enumerator_values))
|
|
)
|
|
result.write(
|
|
DATA_ARRAY_TEMPLATE.format(
|
|
prop_name=prop_name,
|
|
size=len(table),
|
|
entries=",\n".join(
|
|
[
|
|
cpp_entrytemplate.format(x.lower << 11 | x.offset << 2 | x.prop)
|
|
for x in table
|
|
]
|
|
),
|
|
)
|
|
)
|
|
|
|
return result.getvalue()
|
|
|
|
|
|
def generate_data_tables() -> str:
|
|
"""
|
|
Generate Unicode data for inclusion into <format> from
|
|
- https://www.unicode.org/Public/UCD/latest/ucd/DerivedCoreProperties.txt
|
|
|
|
These files are expected to be stored in the same directory as this script.
|
|
"""
|
|
root = Path(__file__).absolute().parent / "data" / "unicode"
|
|
derived_core_path = root / "DerivedCoreProperties.txt"
|
|
|
|
indic_conjunct_break = list()
|
|
with derived_core_path.open(encoding="utf-8") as f:
|
|
indic_conjunct_break_ranges = compactPropertyRanges(
|
|
[x for line in f if (x := parsePropertyLine(line))]
|
|
)
|
|
|
|
indic_conjunct_break_data = generate_cpp_data("Grapheme_Break", indic_conjunct_break_ranges)
|
|
return "\n".join([indic_conjunct_break_data])
|
|
|
|
|
|
if __name__ == "__main__":
|
|
if len(sys.argv) == 2:
|
|
sys.stdout = open(sys.argv[1], "w")
|
|
print(
|
|
MSVC_FORMAT_UCD_TABLES_HPP_TEMPLATE.lstrip().format(
|
|
content=generate_data_tables()
|
|
)
|
|
)
|