6f0c4db90e
The C implementation is still our existing C implementation, but slightly tweaked to fit with upstream's init/block/emits convention. I've tested this by looking at code coverage in kcachegrind and valgrind --tool=callgrind --dump-instr=yes --collect-jumps=yes (NB: valgrind 3.11.0 is needed for AVX2. And even that only does 64-bit AVX2, so we can't get coverage for the 32-bit code yet. But I had to disable that anyway.) This was paired with a hacked up version of poly1305_test that would repeat tests with different ia32cap and armcap values. This isn't checked in, but we badly need a story for testing all the different variants. I'm not happy with upstream's code in either the C/asm boundary or how it dispatches between different versions, but just debugging the code has been a significant time investment. I'd hoped to extract the SIMD parts and do the rest in C, but I think we need to focus on testing first (and use that to guide what modifications would help). For now, this version seems to work at least. The x86 (not x86_64) AVX2 code needs to be disabled because it's broken. It also seems pretty unnecessary. https://rt.openssl.org/Ticket/Display.html?id=4346 Otherwise it seems to work and buys us a decent performance improvement. Notably, my Nexus 6P is finally faster at ChaCha20-Poly1305 than my Nexus 4! bssl speed numbers follow: x86 --- Old: Did 1554000 ChaCha20-Poly1305 (16 bytes) seal operations in 1000536us (1553167.5 ops/sec): 24.9 MB/s Did 136000 ChaCha20-Poly1305 (1350 bytes) seal operations in 1003947us (135465.3 ops/sec): 182.9 MB/s Did 30000 ChaCha20-Poly1305 (8192 bytes) seal operations in 1022990us (29325.8 ops/sec): 240.2 MB/s Did 1888000 ChaCha20-Poly1305-Old (16 bytes) seal operations in 1000206us (1887611.2 ops/sec): 30.2 MB/s Did 173000 ChaCha20-Poly1305-Old (1350 bytes) seal operations in 1003036us (172476.4 ops/sec): 232.8 MB/s Did 30000 ChaCha20-Poly1305-Old (8192 bytes) seal operations in 1027759us (29189.7 ops/sec): 239.1 MB/s New: Did 2030000 ChaCha20-Poly1305 (16 bytes) seal operations in 1000507us (2028971.3 ops/sec): 32.5 MB/s Did 404000 ChaCha20-Poly1305 (1350 bytes) seal operations in 1000287us (403884.1 ops/sec): 545.2 MB/s Did 83000 ChaCha20-Poly1305 (8192 bytes) seal operations in 1001258us (82895.7 ops/sec): 679.1 MB/s Did 2018000 ChaCha20-Poly1305-Old (16 bytes) seal operations in 1000006us (2017987.9 ops/sec): 32.3 MB/s Did 360000 ChaCha20-Poly1305-Old (1350 bytes) seal operations in 1001962us (359295.1 ops/sec): 485.0 MB/s Did 85000 ChaCha20-Poly1305-Old (8192 bytes) seal operations in 1002479us (84789.8 ops/sec): 694.6 MB/s x86_64, no AVX2 --- Old: Did 2023000 ChaCha20-Poly1305 (16 bytes) seal operations in 1000258us (2022478.2 ops/sec): 32.4 MB/s Did 466000 ChaCha20-Poly1305 (1350 bytes) seal operations in 1002619us (464782.7 ops/sec): 627.5 MB/s Did 90000 ChaCha20-Poly1305 (8192 bytes) seal operations in 1001133us (89898.1 ops/sec): 736.4 MB/s Did 2238000 ChaCha20-Poly1305-Old (16 bytes) seal operations in 1000175us (2237608.4 ops/sec): 35.8 MB/s Did 483000 ChaCha20-Poly1305-Old (1350 bytes) seal operations in 1001348us (482349.8 ops/sec): 651.2 MB/s Did 90000 ChaCha20-Poly1305-Old (8192 bytes) seal operations in 1003141us (89718.2 ops/sec): 735.0 MB/s New: Did 2558000 ChaCha20-Poly1305 (16 bytes) seal operations in 1000275us (2557296.7 ops/sec): 40.9 MB/s Did 510000 ChaCha20-Poly1305 (1350 bytes) seal operations in 1001810us (509078.6 ops/sec): 687.3 MB/s Did 115000 ChaCha20-Poly1305 (8192 bytes) seal operations in 1006457us (114262.2 ops/sec): 936.0 MB/s Did 2818000 ChaCha20-Poly1305-Old (16 bytes) seal operations in 1000187us (2817473.1 ops/sec): 45.1 MB/s Did 418000 ChaCha20-Poly1305-Old (1350 bytes) seal operations in 1001140us (417524.0 ops/sec): 563.7 MB/s Did 91000 ChaCha20-Poly1305-Old (8192 bytes) seal operations in 1002539us (90769.5 ops/sec): 743.6 MB/s x86_64, AVX2 --- Old: Did 2516000 ChaCha20-Poly1305 (16 bytes) seal operations in 1000115us (2515710.7 ops/sec): 40.3 MB/s Did 774000 ChaCha20-Poly1305 (1350 bytes) seal operations in 1000300us (773767.9 ops/sec): 1044.6 MB/s Did 171000 ChaCha20-Poly1305 (8192 bytes) seal operations in 1004373us (170255.5 ops/sec): 1394.7 MB/s Did 2580000 ChaCha20-Poly1305-Old (16 bytes) seal operations in 1000144us (2579628.5 ops/sec): 41.3 MB/s Did 769000 ChaCha20-Poly1305-Old (1350 bytes) seal operations in 1000472us (768637.2 ops/sec): 1037.7 MB/s Did 169000 ChaCha20-Poly1305-Old (8192 bytes) seal operations in 1000320us (168945.9 ops/sec): 1384.0 MB/s New: Did 3240000 ChaCha20-Poly1305 (16 bytes) seal operations in 1000114us (3239630.7 ops/sec): 51.8 MB/s Did 932000 ChaCha20-Poly1305 (1350 bytes) seal operations in 1000059us (931945.0 ops/sec): 1258.1 MB/s Did 217000 ChaCha20-Poly1305 (8192 bytes) seal operations in 1003282us (216290.1 ops/sec): 1771.8 MB/s Did 3187000 ChaCha20-Poly1305-Old (16 bytes) seal operations in 1000100us (3186681.3 ops/sec): 51.0 MB/s Did 926000 ChaCha20-Poly1305-Old (1350 bytes) seal operations in 1000071us (925934.3 ops/sec): 1250.0 MB/s Did 215000 ChaCha20-Poly1305-Old (8192 bytes) seal operations in 1000479us (214897.1 ops/sec): 1760.4 MB/s arm, Nexus 4 --- Old: Did 430248 ChaCha20-Poly1305 (16 bytes) seal operations in 1000153us (430182.2 ops/sec): 6.9 MB/s Did 115250 ChaCha20-Poly1305 (1350 bytes) seal operations in 1000549us (115186.8 ops/sec): 155.5 MB/s Did 27000 ChaCha20-Poly1305 (8192 bytes) seal operations in 1030124us (26210.4 ops/sec): 214.7 MB/s Did 451750 ChaCha20-Poly1305-Old (16 bytes) seal operations in 1000549us (451502.1 ops/sec): 7.2 MB/s Did 118000 ChaCha20-Poly1305-Old (1350 bytes) seal operations in 1001557us (117816.6 ops/sec): 159.1 MB/s Did 27000 ChaCha20-Poly1305-Old (8192 bytes) seal operations in 1024263us (26360.4 ops/sec): 215.9 MB/s New: Did 553644 ChaCha20-Poly1305 (16 bytes) seal operations in 1000183us (553542.7 ops/sec): 8.9 MB/s Did 126000 ChaCha20-Poly1305 (1350 bytes) seal operations in 1000396us (125950.1 ops/sec): 170.0 MB/s Did 27000 ChaCha20-Poly1305 (8192 bytes) seal operations in 1000336us (26990.9 ops/sec): 221.1 MB/s Did 559000 ChaCha20-Poly1305-Old (16 bytes) seal operations in 1001465us (558182.3 ops/sec): 8.9 MB/s Did 124000 ChaCha20-Poly1305-Old (1350 bytes) seal operations in 1000824us (123897.9 ops/sec): 167.3 MB/s Did 28000 ChaCha20-Poly1305-Old (8192 bytes) seal operations in 1034854us (27057.0 ops/sec): 221.7 MB/s aarch64, Nexus 6P --- Old: Did 358000 ChaCha20-Poly1305 (16 bytes) seal operations in 1000358us (357871.9 ops/sec): 5.7 MB/s Did 45000 ChaCha20-Poly1305 (1350 bytes) seal operations in 1022386us (44014.7 ops/sec): 59.4 MB/s Did 8657 ChaCha20-Poly1305 (8192 bytes) seal operations in 1063722us (8138.4 ops/sec): 66.7 MB/s Did 350000 ChaCha20-Poly1305-Old (16 bytes) seal operations in 1000074us (349974.1 ops/sec): 5.6 MB/s Did 44000 ChaCha20-Poly1305-Old (1350 bytes) seal operations in 1007907us (43654.8 ops/sec): 58.9 MB/s Did 8525 ChaCha20-Poly1305-Old (8192 bytes) seal operations in 1042644us (8176.3 ops/sec): 67.0 MB/s New: Did 713000 ChaCha20-Poly1305 (16 bytes) seal operations in 1000190us (712864.6 ops/sec): 11.4 MB/s Did 180000 ChaCha20-Poly1305 (1350 bytes) seal operations in 1004249us (179238.4 ops/sec): 242.0 MB/s Did 41000 ChaCha20-Poly1305 (8192 bytes) seal operations in 1005811us (40763.1 ops/sec): 333.9 MB/s Did 775000 ChaCha20-Poly1305-Old (16 bytes) seal operations in 1000719us (774443.2 ops/sec): 12.4 MB/s Did 182000 ChaCha20-Poly1305-Old (1350 bytes) seal operations in 1003529us (181360.0 ops/sec): 244.8 MB/s Did 41000 ChaCha20-Poly1305-Old (8192 bytes) seal operations in 1010576us (40570.9 ops/sec): 332.4 MB/s Change-Id: Iaa4ab86ac1174b79833077963cc3616cfb08e686 Reviewed-on: https://boringssl-review.googlesource.com/7226 Reviewed-by: Adam Langley <agl@google.com>
552 lines
17 KiB
Python
552 lines
17 KiB
Python
# Copyright (c) 2015, Google Inc.
|
|
#
|
|
# Permission to use, copy, modify, and/or distribute this software for any
|
|
# purpose with or without fee is hereby granted, provided that the above
|
|
# copyright notice and this permission notice appear in all copies.
|
|
#
|
|
# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
|
|
# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
|
# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
|
|
# SPECIAL, DIRECT, 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 THIS SOFTWARE.
|
|
|
|
"""Enumerates the BoringSSL source in src/ and either generates two gypi files
|
|
(boringssl.gypi and boringssl_tests.gypi) for Chromium, or generates
|
|
source-list files for Android."""
|
|
|
|
import os
|
|
import subprocess
|
|
import sys
|
|
import json
|
|
|
|
|
|
# OS_ARCH_COMBOS maps from OS and platform to the OpenSSL assembly "style" for
|
|
# that platform and the extension used by asm files.
|
|
OS_ARCH_COMBOS = [
|
|
('linux', 'arm', 'linux32', [], 'S'),
|
|
('linux', 'aarch64', 'linux64', [], 'S'),
|
|
('linux', 'x86', 'elf', ['-fPIC', '-DOPENSSL_IA32_SSE2'], 'S'),
|
|
('linux', 'x86_64', 'elf', [], 'S'),
|
|
('mac', 'x86', 'macosx', ['-fPIC', '-DOPENSSL_IA32_SSE2'], 'S'),
|
|
('mac', 'x86_64', 'macosx', [], 'S'),
|
|
('win', 'x86', 'win32n', ['-DOPENSSL_IA32_SSE2'], 'asm'),
|
|
('win', 'x86_64', 'nasm', [], 'asm'),
|
|
]
|
|
|
|
# NON_PERL_FILES enumerates assembly files that are not processed by the
|
|
# perlasm system.
|
|
NON_PERL_FILES = {
|
|
('linux', 'arm'): [
|
|
'src/crypto/cpu-arm-asm.S',
|
|
'src/crypto/curve25519/asm/x25519-asm-arm.S',
|
|
],
|
|
('linux', 'x86_64'): [
|
|
'src/crypto/curve25519/asm/x25519-asm-x86_64.S',
|
|
],
|
|
}
|
|
|
|
|
|
class Chromium(object):
|
|
|
|
def __init__(self):
|
|
self.header = \
|
|
"""# Copyright (c) 2014 The Chromium Authors. All rights reserved.
|
|
# Use of this source code is governed by a BSD-style license that can be
|
|
# found in the LICENSE file.
|
|
|
|
# This file is created by generate_build_files.py. Do not edit manually.
|
|
|
|
"""
|
|
|
|
def PrintVariableSection(self, out, name, files):
|
|
out.write(' \'%s\': [\n' % name)
|
|
for f in sorted(files):
|
|
out.write(' \'%s\',\n' % f)
|
|
out.write(' ],\n')
|
|
|
|
def WriteFiles(self, files, asm_outputs):
|
|
with open('boringssl.gypi', 'w+') as gypi:
|
|
gypi.write(self.header + '{\n \'variables\': {\n')
|
|
|
|
self.PrintVariableSection(
|
|
gypi, 'boringssl_ssl_sources', files['ssl'])
|
|
self.PrintVariableSection(
|
|
gypi, 'boringssl_crypto_sources', files['crypto'])
|
|
|
|
for ((osname, arch), asm_files) in asm_outputs:
|
|
self.PrintVariableSection(gypi, 'boringssl_%s_%s_sources' %
|
|
(osname, arch), asm_files)
|
|
|
|
gypi.write(' }\n}\n')
|
|
|
|
with open('boringssl_tests.gypi', 'w+') as test_gypi:
|
|
test_gypi.write(self.header + '{\n \'targets\': [\n')
|
|
|
|
test_names = []
|
|
for test in sorted(files['test']):
|
|
test_name = 'boringssl_%s' % os.path.splitext(os.path.basename(test))[0]
|
|
test_gypi.write(""" {
|
|
'target_name': '%s',
|
|
'type': 'executable',
|
|
'dependencies': [
|
|
'boringssl.gyp:boringssl',
|
|
],
|
|
'sources': [
|
|
'%s',
|
|
'<@(boringssl_test_support_sources)',
|
|
],
|
|
# TODO(davidben): Fix size_t truncations in BoringSSL.
|
|
# https://crbug.com/429039
|
|
'msvs_disabled_warnings': [ 4267, ],
|
|
},\n""" % (test_name, test))
|
|
test_names.append(test_name)
|
|
|
|
test_names.sort()
|
|
|
|
test_gypi.write(' ],\n \'variables\': {\n')
|
|
|
|
self.PrintVariableSection(
|
|
test_gypi, 'boringssl_test_support_sources', files['test_support'])
|
|
|
|
test_gypi.write(' \'boringssl_test_targets\': [\n')
|
|
|
|
for test in test_names:
|
|
test_gypi.write(""" '%s',\n""" % test)
|
|
|
|
test_gypi.write(' ],\n }\n}\n')
|
|
|
|
|
|
class Android(object):
|
|
|
|
def __init__(self):
|
|
self.header = \
|
|
"""# Copyright (C) 2015 The Android Open Source Project
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
|
|
"""
|
|
|
|
def ExtraFiles(self):
|
|
return ['android_compat_hacks.c', 'android_compat_keywrap.c']
|
|
|
|
def PrintVariableSection(self, out, name, files):
|
|
out.write('%s := \\\n' % name)
|
|
for f in sorted(files):
|
|
out.write(' %s\\\n' % f)
|
|
out.write('\n')
|
|
|
|
def WriteFiles(self, files, asm_outputs):
|
|
with open('sources.mk', 'w+') as makefile:
|
|
makefile.write(self.header)
|
|
|
|
crypto_files = files['crypto'] + self.ExtraFiles()
|
|
self.PrintVariableSection(makefile, 'crypto_sources', crypto_files)
|
|
self.PrintVariableSection(makefile, 'ssl_sources', files['ssl'])
|
|
self.PrintVariableSection(makefile, 'tool_sources', files['tool'])
|
|
|
|
for ((osname, arch), asm_files) in asm_outputs:
|
|
self.PrintVariableSection(
|
|
makefile, '%s_%s_sources' % (osname, arch), asm_files)
|
|
|
|
|
|
class AndroidStandalone(Android):
|
|
"""AndroidStandalone is for Android builds outside of the Android-system, i.e.
|
|
|
|
for applications that wish wish to ship BoringSSL.
|
|
"""
|
|
|
|
def ExtraFiles(self):
|
|
return []
|
|
|
|
|
|
class Bazel(object):
|
|
"""Bazel outputs files suitable for including in Bazel files."""
|
|
|
|
def __init__(self):
|
|
self.firstSection = True
|
|
self.header = \
|
|
"""# This file is created by generate_build_files.py. Do not edit manually.
|
|
|
|
"""
|
|
|
|
def PrintVariableSection(self, out, name, files):
|
|
if not self.firstSection:
|
|
out.write('\n')
|
|
self.firstSection = False
|
|
|
|
out.write('%s = [\n' % name)
|
|
for f in sorted(files):
|
|
out.write(' "%s",\n' % f)
|
|
out.write(']\n')
|
|
|
|
def WriteFiles(self, files, asm_outputs):
|
|
with open('BUILD.generated.bzl', 'w+') as out:
|
|
out.write(self.header)
|
|
|
|
self.PrintVariableSection(out, 'ssl_headers', files['ssl_headers'])
|
|
self.PrintVariableSection(
|
|
out, 'ssl_internal_headers', files['ssl_internal_headers'])
|
|
self.PrintVariableSection(out, 'ssl_sources', files['ssl'])
|
|
self.PrintVariableSection(out, 'crypto_headers', files['crypto_headers'])
|
|
self.PrintVariableSection(
|
|
out, 'crypto_internal_headers', files['crypto_internal_headers'])
|
|
self.PrintVariableSection(out, 'crypto_sources', files['crypto'])
|
|
self.PrintVariableSection(out, 'tool_sources', files['tool'])
|
|
|
|
for ((osname, arch), asm_files) in asm_outputs:
|
|
self.PrintVariableSection(
|
|
out, 'crypto_sources_%s_%s' % (osname, arch), asm_files)
|
|
|
|
with open('BUILD.generated_tests.bzl', 'w+') as out:
|
|
out.write(self.header)
|
|
|
|
out.write('test_support_sources = [\n')
|
|
for filename in files['test_support']:
|
|
if os.path.basename(filename) == 'malloc.cc':
|
|
continue
|
|
out.write(' "%s",\n' % filename)
|
|
|
|
out.write(']\n\n')
|
|
|
|
out.write('def create_tests(copts):\n')
|
|
out.write(' test_support_sources_complete = test_support_sources + \\\n')
|
|
out.write(' native.glob(["src/crypto/test/*.h"])\n')
|
|
name_counts = {}
|
|
for test in files['tests']:
|
|
name = os.path.basename(test[0])
|
|
name_counts[name] = name_counts.get(name, 0) + 1
|
|
|
|
first = True
|
|
for test in files['tests']:
|
|
name = os.path.basename(test[0])
|
|
if name_counts[name] > 1:
|
|
if '/' in test[1]:
|
|
name += '_' + os.path.splitext(os.path.basename(test[1]))[0]
|
|
else:
|
|
name += '_' + test[1].replace('-', '_')
|
|
|
|
if not first:
|
|
out.write('\n')
|
|
first = False
|
|
|
|
src_prefix = 'src/' + test[0]
|
|
for src in files['test']:
|
|
if src.startswith(src_prefix):
|
|
src = src
|
|
break
|
|
else:
|
|
raise ValueError("Can't find source for %s" % test[0])
|
|
|
|
out.write(' native.cc_test(\n')
|
|
out.write(' name = "%s",\n' % name)
|
|
out.write(' size = "small",\n')
|
|
out.write(' srcs = ["%s"] + test_support_sources_complete,\n' % src)
|
|
|
|
data_files = []
|
|
if len(test) > 1:
|
|
|
|
out.write(' args = [\n')
|
|
for arg in test[1:]:
|
|
if '/' in arg:
|
|
out.write(' "$(location src/%s)",\n' % arg)
|
|
data_files.append('src/%s' % arg)
|
|
else:
|
|
out.write(' "%s",\n' % arg)
|
|
out.write(' ],\n')
|
|
|
|
out.write(' copts = copts,\n')
|
|
|
|
if len(data_files) > 0:
|
|
out.write(' data = [\n')
|
|
for filename in data_files:
|
|
out.write(' "%s",\n' % filename)
|
|
out.write(' ],\n')
|
|
|
|
if 'ssl/' in test[0]:
|
|
out.write(' deps = [\n')
|
|
out.write(' ":crypto",\n')
|
|
out.write(' ":ssl",\n')
|
|
out.write(' ],\n')
|
|
else:
|
|
out.write(' deps = [":crypto"],\n')
|
|
out.write(' )\n')
|
|
|
|
|
|
def FindCMakeFiles(directory):
|
|
"""Returns list of all CMakeLists.txt files recursively in directory."""
|
|
cmakefiles = []
|
|
|
|
for (path, _, filenames) in os.walk(directory):
|
|
for filename in filenames:
|
|
if filename == 'CMakeLists.txt':
|
|
cmakefiles.append(os.path.join(path, filename))
|
|
|
|
return cmakefiles
|
|
|
|
|
|
def NoTests(dent, is_dir):
|
|
"""Filter function that can be passed to FindCFiles in order to remove test
|
|
sources."""
|
|
if is_dir:
|
|
return dent != 'test'
|
|
return 'test.' not in dent and not dent.startswith('example_')
|
|
|
|
|
|
def OnlyTests(dent, is_dir):
|
|
"""Filter function that can be passed to FindCFiles in order to remove
|
|
non-test sources."""
|
|
if is_dir:
|
|
return dent != 'test'
|
|
return '_test.' in dent or dent.startswith('example_')
|
|
|
|
|
|
def AllFiles(dent, is_dir):
|
|
"""Filter function that can be passed to FindCFiles in order to include all
|
|
sources."""
|
|
return True
|
|
|
|
|
|
def SSLHeaderFiles(dent, is_dir):
|
|
return dent in ['ssl.h', 'tls1.h', 'ssl23.h', 'ssl3.h', 'dtls1.h']
|
|
|
|
|
|
def FindCFiles(directory, filter_func):
|
|
"""Recurses through directory and returns a list of paths to all the C source
|
|
files that pass filter_func."""
|
|
cfiles = []
|
|
|
|
for (path, dirnames, filenames) in os.walk(directory):
|
|
for filename in filenames:
|
|
if not filename.endswith('.c') and not filename.endswith('.cc'):
|
|
continue
|
|
if not filter_func(filename, False):
|
|
continue
|
|
cfiles.append(os.path.join(path, filename))
|
|
|
|
for (i, dirname) in enumerate(dirnames):
|
|
if not filter_func(dirname, True):
|
|
del dirnames[i]
|
|
|
|
return cfiles
|
|
|
|
|
|
def FindHeaderFiles(directory, filter_func):
|
|
"""Recurses through directory and returns a list of paths to all the header files that pass filter_func."""
|
|
hfiles = []
|
|
|
|
for (path, dirnames, filenames) in os.walk(directory):
|
|
for filename in filenames:
|
|
if not filename.endswith('.h'):
|
|
continue
|
|
if not filter_func(filename, False):
|
|
continue
|
|
hfiles.append(os.path.join(path, filename))
|
|
|
|
return hfiles
|
|
|
|
|
|
def ExtractPerlAsmFromCMakeFile(cmakefile):
|
|
"""Parses the contents of the CMakeLists.txt file passed as an argument and
|
|
returns a list of all the perlasm() directives found in the file."""
|
|
perlasms = []
|
|
with open(cmakefile) as f:
|
|
for line in f:
|
|
line = line.strip()
|
|
if not line.startswith('perlasm('):
|
|
continue
|
|
if not line.endswith(')'):
|
|
raise ValueError('Bad perlasm line in %s' % cmakefile)
|
|
# Remove "perlasm(" from start and ")" from end
|
|
params = line[8:-1].split()
|
|
if len(params) < 2:
|
|
raise ValueError('Bad perlasm line in %s' % cmakefile)
|
|
perlasms.append({
|
|
'extra_args': params[2:],
|
|
'input': os.path.join(os.path.dirname(cmakefile), params[1]),
|
|
'output': os.path.join(os.path.dirname(cmakefile), params[0]),
|
|
})
|
|
|
|
return perlasms
|
|
|
|
|
|
def ReadPerlAsmOperations():
|
|
"""Returns a list of all perlasm() directives found in CMake config files in
|
|
src/."""
|
|
perlasms = []
|
|
cmakefiles = FindCMakeFiles('src')
|
|
|
|
for cmakefile in cmakefiles:
|
|
perlasms.extend(ExtractPerlAsmFromCMakeFile(cmakefile))
|
|
|
|
return perlasms
|
|
|
|
|
|
def PerlAsm(output_filename, input_filename, perlasm_style, extra_args):
|
|
"""Runs the a perlasm script and puts the output into output_filename."""
|
|
base_dir = os.path.dirname(output_filename)
|
|
if not os.path.isdir(base_dir):
|
|
os.makedirs(base_dir)
|
|
output = subprocess.check_output(
|
|
['perl', input_filename, perlasm_style] + extra_args)
|
|
with open(output_filename, 'w+') as out_file:
|
|
out_file.write(output)
|
|
|
|
|
|
def ArchForAsmFilename(filename):
|
|
"""Returns the architectures that a given asm file should be compiled for
|
|
based on substrings in the filename."""
|
|
|
|
if 'x86_64' in filename or 'avx2' in filename:
|
|
return ['x86_64']
|
|
elif ('x86' in filename and 'x86_64' not in filename) or '586' in filename:
|
|
return ['x86']
|
|
elif 'armx' in filename:
|
|
return ['arm', 'aarch64']
|
|
elif 'armv8' in filename:
|
|
return ['aarch64']
|
|
elif 'arm' in filename:
|
|
return ['arm']
|
|
else:
|
|
raise ValueError('Unknown arch for asm filename: ' + filename)
|
|
|
|
|
|
def WriteAsmFiles(perlasms):
|
|
"""Generates asm files from perlasm directives for each supported OS x
|
|
platform combination."""
|
|
asmfiles = {}
|
|
|
|
for osarch in OS_ARCH_COMBOS:
|
|
(osname, arch, perlasm_style, extra_args, asm_ext) = osarch
|
|
key = (osname, arch)
|
|
outDir = '%s-%s' % key
|
|
|
|
for perlasm in perlasms:
|
|
filename = os.path.basename(perlasm['input'])
|
|
output = perlasm['output']
|
|
if not output.startswith('src'):
|
|
raise ValueError('output missing src: %s' % output)
|
|
output = os.path.join(outDir, output[4:])
|
|
if output.endswith('-armx.${ASM_EXT}'):
|
|
output = output.replace('-armx',
|
|
'-armx64' if arch == 'aarch64' else '-armx32')
|
|
output = output.replace('${ASM_EXT}', asm_ext)
|
|
|
|
if arch in ArchForAsmFilename(filename):
|
|
PerlAsm(output, perlasm['input'], perlasm_style,
|
|
perlasm['extra_args'] + extra_args)
|
|
asmfiles.setdefault(key, []).append(output)
|
|
|
|
for (key, non_perl_asm_files) in NON_PERL_FILES.iteritems():
|
|
asmfiles.setdefault(key, []).extend(non_perl_asm_files)
|
|
|
|
return asmfiles
|
|
|
|
|
|
def main(platforms):
|
|
crypto_c_files = FindCFiles(os.path.join('src', 'crypto'), NoTests)
|
|
ssl_c_files = FindCFiles(os.path.join('src', 'ssl'), NoTests)
|
|
tool_cc_files = FindCFiles(os.path.join('src', 'tool'), NoTests)
|
|
|
|
# Generate err_data.c
|
|
with open('err_data.c', 'w+') as err_data:
|
|
subprocess.check_call(['go', 'run', 'err_data_generate.go'],
|
|
cwd=os.path.join('src', 'crypto', 'err'),
|
|
stdout=err_data)
|
|
crypto_c_files.append('err_data.c')
|
|
|
|
test_support_cc_files = FindCFiles(os.path.join('src', 'crypto', 'test'),
|
|
AllFiles)
|
|
|
|
test_c_files = FindCFiles(os.path.join('src', 'crypto'), OnlyTests)
|
|
test_c_files += FindCFiles(os.path.join('src', 'ssl'), OnlyTests)
|
|
|
|
ssl_h_files = (
|
|
FindHeaderFiles(
|
|
os.path.join('src', 'include', 'openssl'),
|
|
SSLHeaderFiles))
|
|
|
|
def NotSSLHeaderFiles(filename, is_dir):
|
|
return not SSLHeaderFiles(filename, is_dir)
|
|
crypto_h_files = (
|
|
FindHeaderFiles(
|
|
os.path.join('src', 'include', 'openssl'),
|
|
NotSSLHeaderFiles))
|
|
|
|
ssl_internal_h_files = FindHeaderFiles(os.path.join('src', 'ssl'), NoTests)
|
|
crypto_internal_h_files = FindHeaderFiles(
|
|
os.path.join('src', 'crypto'), NoTests)
|
|
|
|
with open('src/util/all_tests.json', 'r') as f:
|
|
tests = json.load(f)
|
|
test_binaries = set([test[0] for test in tests])
|
|
test_sources = set([
|
|
test.replace('.cc', '').replace('.c', '').replace(
|
|
'src/',
|
|
'')
|
|
for test in test_c_files])
|
|
if test_binaries != test_sources:
|
|
print 'Test sources and configured tests do not match'
|
|
a = test_binaries.difference(test_sources)
|
|
if len(a) > 0:
|
|
print 'These tests are configured without sources: ' + str(a)
|
|
b = test_sources.difference(test_binaries)
|
|
if len(b) > 0:
|
|
print 'These test sources are not configured: ' + str(b)
|
|
|
|
files = {
|
|
'crypto': crypto_c_files,
|
|
'crypto_headers': crypto_h_files,
|
|
'crypto_internal_headers': crypto_internal_h_files,
|
|
'ssl': ssl_c_files,
|
|
'ssl_headers': ssl_h_files,
|
|
'ssl_internal_headers': ssl_internal_h_files,
|
|
'tool': tool_cc_files,
|
|
'test': test_c_files,
|
|
'test_support': test_support_cc_files,
|
|
'tests': tests,
|
|
}
|
|
|
|
asm_outputs = sorted(WriteAsmFiles(ReadPerlAsmOperations()).iteritems())
|
|
|
|
for platform in platforms:
|
|
platform.WriteFiles(files, asm_outputs)
|
|
|
|
return 0
|
|
|
|
|
|
def Usage():
|
|
print 'Usage: python %s [chromium|android|android-standalone|bazel]' % sys.argv[0]
|
|
sys.exit(1)
|
|
|
|
|
|
if __name__ == '__main__':
|
|
if len(sys.argv) < 2:
|
|
Usage()
|
|
|
|
platforms = []
|
|
for s in sys.argv[1:]:
|
|
if s == 'chromium' or s == 'gyp':
|
|
platforms.append(Chromium())
|
|
elif s == 'android':
|
|
platforms.append(Android())
|
|
elif s == 'android-standalone':
|
|
platforms.append(AndroidStandalone())
|
|
elif s == 'bazel':
|
|
platforms.append(Bazel())
|
|
else:
|
|
Usage()
|
|
|
|
sys.exit(main(platforms))
|