Resubmit r325107 (case folding DJB hash)
The issue was that the has function was generating different results depending
on the signedness of char on the host platform. This commit fixes the issue by
explicitly using an unsigned char type to prevent sign extension and
adds some extra tests.
The original commit message was:
This patch implements a variant of the DJB hash function which folds the
input according to the algorithm in the Dwarf 5 specification (Section
6.1.1.4.5), which in turn references the Unicode Standard (Section 5.18,
"Case Mappings").
To achieve this, I have added a llvm::sys::unicode::foldCharSimple
function, which performs this mapping. The implementation of this
function was generated from the CaseMatching.txt file from the Unicode
spec using a python script (which is also included in this patch). The
script tries to optimize the function by coalescing adjecant mappings
with the same shift and stride (terms I made up). Theoretically, it
could be made a bit smarter and merge adjecant blocks that were
interrupted by only one or two characters with exceptional mapping, but
this would save only a couple of branches, while it would greatly
complicate the implementation, so I deemed it was not worth it.
Since we assume that the vast majority of the input characters will be
US-ASCII, the folding hash function has a fast-path for handling these,
and only whips out the full decode+fold+encode logic if we encounter a
character outside of this range. It might be possible to implement the
folding directly on utf8 sequences, but this would also bring a lot of
complexity for the few cases where we will actually need to process
non-ascii characters.
Reviewers: JDevlieghere, aprantl, probinson, dblaikie
Subscribers: mgorny, hintonda, echristo, clayborg, vleschuk, llvm-commits
Differential Revision: https://reviews.llvm.org/D42740
llvm-svn: 325732
2018-02-21 23:36:31 +01:00
|
|
|
#!/usr/bin/env python
|
|
|
|
"""
|
|
|
|
Unicode case folding database conversion utility
|
|
|
|
|
|
|
|
Parses the database and generates a C++ function which implements the case
|
|
|
|
folding algorithm. The database entries are of the form:
|
|
|
|
|
|
|
|
<code>; <status>; <mapping>; # <name>
|
|
|
|
|
|
|
|
<status> can be one of four characters:
|
|
|
|
C - Common mappings
|
|
|
|
S - mappings for Simple case folding
|
|
|
|
F - mappings for Full case folding
|
|
|
|
T - special case for Turkish I characters
|
|
|
|
|
|
|
|
Right now this generates a function which implements simple case folding (C+S
|
|
|
|
entries).
|
|
|
|
"""
|
|
|
|
|
2019-01-03 15:11:33 +01:00
|
|
|
from __future__ import print_function
|
|
|
|
|
Resubmit r325107 (case folding DJB hash)
The issue was that the has function was generating different results depending
on the signedness of char on the host platform. This commit fixes the issue by
explicitly using an unsigned char type to prevent sign extension and
adds some extra tests.
The original commit message was:
This patch implements a variant of the DJB hash function which folds the
input according to the algorithm in the Dwarf 5 specification (Section
6.1.1.4.5), which in turn references the Unicode Standard (Section 5.18,
"Case Mappings").
To achieve this, I have added a llvm::sys::unicode::foldCharSimple
function, which performs this mapping. The implementation of this
function was generated from the CaseMatching.txt file from the Unicode
spec using a python script (which is also included in this patch). The
script tries to optimize the function by coalescing adjecant mappings
with the same shift and stride (terms I made up). Theoretically, it
could be made a bit smarter and merge adjecant blocks that were
interrupted by only one or two characters with exceptional mapping, but
this would save only a couple of branches, while it would greatly
complicate the implementation, so I deemed it was not worth it.
Since we assume that the vast majority of the input characters will be
US-ASCII, the folding hash function has a fast-path for handling these,
and only whips out the full decode+fold+encode logic if we encounter a
character outside of this range. It might be possible to implement the
folding directly on utf8 sequences, but this would also bring a lot of
complexity for the few cases where we will actually need to process
non-ascii characters.
Reviewers: JDevlieghere, aprantl, probinson, dblaikie
Subscribers: mgorny, hintonda, echristo, clayborg, vleschuk, llvm-commits
Differential Revision: https://reviews.llvm.org/D42740
llvm-svn: 325732
2018-02-21 23:36:31 +01:00
|
|
|
import sys
|
|
|
|
import re
|
2019-01-03 15:12:44 +01:00
|
|
|
try:
|
|
|
|
from urllib.request import urlopen
|
|
|
|
except ImportError:
|
|
|
|
from urllib2 import urlopen
|
|
|
|
|
Resubmit r325107 (case folding DJB hash)
The issue was that the has function was generating different results depending
on the signedness of char on the host platform. This commit fixes the issue by
explicitly using an unsigned char type to prevent sign extension and
adds some extra tests.
The original commit message was:
This patch implements a variant of the DJB hash function which folds the
input according to the algorithm in the Dwarf 5 specification (Section
6.1.1.4.5), which in turn references the Unicode Standard (Section 5.18,
"Case Mappings").
To achieve this, I have added a llvm::sys::unicode::foldCharSimple
function, which performs this mapping. The implementation of this
function was generated from the CaseMatching.txt file from the Unicode
spec using a python script (which is also included in this patch). The
script tries to optimize the function by coalescing adjecant mappings
with the same shift and stride (terms I made up). Theoretically, it
could be made a bit smarter and merge adjecant blocks that were
interrupted by only one or two characters with exceptional mapping, but
this would save only a couple of branches, while it would greatly
complicate the implementation, so I deemed it was not worth it.
Since we assume that the vast majority of the input characters will be
US-ASCII, the folding hash function has a fast-path for handling these,
and only whips out the full decode+fold+encode logic if we encounter a
character outside of this range. It might be possible to implement the
folding directly on utf8 sequences, but this would also bring a lot of
complexity for the few cases where we will actually need to process
non-ascii characters.
Reviewers: JDevlieghere, aprantl, probinson, dblaikie
Subscribers: mgorny, hintonda, echristo, clayborg, vleschuk, llvm-commits
Differential Revision: https://reviews.llvm.org/D42740
llvm-svn: 325732
2018-02-21 23:36:31 +01:00
|
|
|
|
|
|
|
# This variable will body of the mappings function
|
|
|
|
body = ""
|
|
|
|
|
|
|
|
# Reads file line-by-line, extracts Common and Simple case fold mappings and
|
|
|
|
# returns a (from_char, to_char, from_name) tuple.
|
|
|
|
def mappings(f):
|
|
|
|
previous_from = -1
|
|
|
|
expr = re.compile(r'^(.*); [CS]; (.*); # (.*)')
|
|
|
|
for line in f:
|
|
|
|
m = expr.match(line)
|
|
|
|
if not m: continue
|
|
|
|
from_char = int(m.group(1), 16)
|
|
|
|
to_char = int(m.group(2), 16)
|
|
|
|
from_name = m.group(3)
|
|
|
|
|
|
|
|
if from_char <= previous_from:
|
|
|
|
raise Exception("Duplicate or unsorted characters in input")
|
|
|
|
yield from_char, to_char, from_name
|
|
|
|
previous_from = from_char
|
|
|
|
|
|
|
|
# Computes the shift (to_char - from_char) in a mapping.
|
|
|
|
def shift(mapping):
|
|
|
|
return mapping[1] - mapping[0]
|
|
|
|
|
|
|
|
# Computes the stride (from_char2 - from_char1) of two mappings.
|
|
|
|
def stride2(mapping1, mapping2):
|
|
|
|
return mapping2[0] - mapping1[0]
|
|
|
|
|
|
|
|
# Computes the stride of a list of mappings. The list should have at least two
|
|
|
|
# mappings. All mappings in the list are assumed to have the same stride.
|
|
|
|
def stride(block):
|
|
|
|
return stride2(block[0], block[1])
|
|
|
|
|
|
|
|
|
|
|
|
# b is a list of mappings. All the mappings are assumed to have the same
|
|
|
|
# shift and the stride between adjecant mappings (if any) is constant.
|
|
|
|
def dump_block(b):
|
|
|
|
global body
|
|
|
|
|
|
|
|
if len(b) == 1:
|
|
|
|
# Special case for handling blocks of length 1. We don't even need to
|
|
|
|
# emit the "if (C < X) return C" check below as all characters in this
|
|
|
|
# range will be caught by the "C < X" check emitted by the first
|
|
|
|
# non-trivial block.
|
|
|
|
body += " // {2}\n if (C == {0:#06x})\n return {1:#06x};\n".format(*b[0])
|
|
|
|
return
|
|
|
|
|
|
|
|
first = b[0][0]
|
|
|
|
last = first + stride(b) * (len(b)-1)
|
|
|
|
modulo = first % stride(b)
|
|
|
|
|
|
|
|
# All characters before this block map to themselves.
|
|
|
|
body += " if (C < {0:#06x})\n return C;\n".format(first)
|
|
|
|
body += " // {0} characters\n".format(len(b))
|
|
|
|
|
|
|
|
# Generic pattern: check upper bound (lower bound is checked by the "if"
|
|
|
|
# above) and modulo of C, return C+shift.
|
|
|
|
pattern = " if (C <= {0:#06x} && C % {1} == {2})\n return C + {3};\n"
|
|
|
|
|
|
|
|
if stride(b) == 2 and shift(b[0]) == 1 and modulo == 0:
|
|
|
|
# Special case:
|
|
|
|
# We can elide the modulo-check because the expression "C|1" will map
|
|
|
|
# the intervening characters to themselves.
|
|
|
|
pattern = " if (C <= {0:#06x})\n return C | 1;\n"
|
|
|
|
elif stride(b) == 1:
|
|
|
|
# Another special case: X % 1 is always zero, so don't emit the
|
|
|
|
# modulo-check.
|
|
|
|
pattern = " if (C <= {0:#06x})\n return C + {3};\n"
|
|
|
|
|
|
|
|
body += pattern.format(last, stride(b), modulo, shift(b[0]))
|
|
|
|
|
|
|
|
current_block = []
|
2019-01-03 15:12:44 +01:00
|
|
|
f = urlopen(sys.argv[1])
|
Resubmit r325107 (case folding DJB hash)
The issue was that the has function was generating different results depending
on the signedness of char on the host platform. This commit fixes the issue by
explicitly using an unsigned char type to prevent sign extension and
adds some extra tests.
The original commit message was:
This patch implements a variant of the DJB hash function which folds the
input according to the algorithm in the Dwarf 5 specification (Section
6.1.1.4.5), which in turn references the Unicode Standard (Section 5.18,
"Case Mappings").
To achieve this, I have added a llvm::sys::unicode::foldCharSimple
function, which performs this mapping. The implementation of this
function was generated from the CaseMatching.txt file from the Unicode
spec using a python script (which is also included in this patch). The
script tries to optimize the function by coalescing adjecant mappings
with the same shift and stride (terms I made up). Theoretically, it
could be made a bit smarter and merge adjecant blocks that were
interrupted by only one or two characters with exceptional mapping, but
this would save only a couple of branches, while it would greatly
complicate the implementation, so I deemed it was not worth it.
Since we assume that the vast majority of the input characters will be
US-ASCII, the folding hash function has a fast-path for handling these,
and only whips out the full decode+fold+encode logic if we encounter a
character outside of this range. It might be possible to implement the
folding directly on utf8 sequences, but this would also bring a lot of
complexity for the few cases where we will actually need to process
non-ascii characters.
Reviewers: JDevlieghere, aprantl, probinson, dblaikie
Subscribers: mgorny, hintonda, echristo, clayborg, vleschuk, llvm-commits
Differential Revision: https://reviews.llvm.org/D42740
llvm-svn: 325732
2018-02-21 23:36:31 +01:00
|
|
|
for m in mappings(f):
|
|
|
|
if len(current_block) == 0:
|
|
|
|
current_block.append(m)
|
|
|
|
continue
|
|
|
|
|
|
|
|
if shift(current_block[0]) != shift(m):
|
|
|
|
# Incompatible shift, start a new block.
|
|
|
|
dump_block(current_block)
|
|
|
|
current_block = [m]
|
|
|
|
continue
|
|
|
|
|
|
|
|
if len(current_block) == 1 or stride(current_block) == stride2(current_block[-1], m):
|
|
|
|
current_block.append(m)
|
|
|
|
continue
|
|
|
|
|
|
|
|
# Incompatible stride, start a new block.
|
|
|
|
dump_block(current_block)
|
|
|
|
current_block = [m]
|
|
|
|
f.close()
|
|
|
|
|
|
|
|
dump_block(current_block)
|
|
|
|
|
2019-01-03 15:11:33 +01:00
|
|
|
print('//===---------- Support/UnicodeCaseFold.cpp -------------------------------===//')
|
|
|
|
print('//')
|
|
|
|
print('// This file was generated by utils/unicode-case-fold.py from the Unicode')
|
|
|
|
print('// case folding database at')
|
|
|
|
print('// ', sys.argv[1])
|
|
|
|
print('//')
|
|
|
|
print('// To regenerate this file, run:')
|
|
|
|
print('// utils/unicode-case-fold.py \\')
|
|
|
|
print('// "{}" \\'.format(sys.argv[1]))
|
|
|
|
print('// > lib/Support/UnicodeCaseFold.cpp')
|
|
|
|
print('//')
|
|
|
|
print('//===----------------------------------------------------------------------===//')
|
|
|
|
print('')
|
|
|
|
print('#include "llvm/Support/Unicode.h"')
|
|
|
|
print('')
|
|
|
|
print("int llvm::sys::unicode::foldCharSimple(int C) {")
|
|
|
|
print(body)
|
|
|
|
print(" return C;")
|
|
|
|
print("}")
|