License cleanup: add SPDX GPL-2.0 license identifier to files with no license
Many source files in the tree are missing licensing information, which
makes it harder for compliance tools to determine the correct license.
By default all files without license information are under the default
license of the kernel, which is GPL version 2.
Update the files which contain no license information with the 'GPL-2.0'
SPDX license identifier. The SPDX identifier is a legally binding
shorthand, which can be used instead of the full boiler plate text.
This patch is based on work done by Thomas Gleixner and Kate Stewart and
Philippe Ombredanne.
How this work was done:
Patches were generated and checked against linux-4.14-rc6 for a subset of
the use cases:
- file had no licensing information it it.
- file was a */uapi/* one with no licensing information in it,
- file was a */uapi/* one with existing licensing information,
Further patches will be generated in subsequent months to fix up cases
where non-standard license headers were used, and references to license
had to be inferred by heuristics based on keywords.
The analysis to determine which SPDX License Identifier to be applied to
a file was done in a spreadsheet of side by side results from of the
output of two independent scanners (ScanCode & Windriver) producing SPDX
tag:value files created by Philippe Ombredanne. Philippe prepared the
base worksheet, and did an initial spot review of a few 1000 files.
The 4.13 kernel was the starting point of the analysis with 60,537 files
assessed. Kate Stewart did a file by file comparison of the scanner
results in the spreadsheet to determine which SPDX license identifier(s)
to be applied to the file. She confirmed any determination that was not
immediately clear with lawyers working with the Linux Foundation.
Criteria used to select files for SPDX license identifier tagging was:
- Files considered eligible had to be source code files.
- Make and config files were included as candidates if they contained >5
lines of source
- File already had some variant of a license header in it (even if <5
lines).
All documentation files were explicitly excluded.
The following heuristics were used to determine which SPDX license
identifiers to apply.
- when both scanners couldn't find any license traces, file was
considered to have no license information in it, and the top level
COPYING file license applied.
For non */uapi/* files that summary was:
SPDX license identifier # files
---------------------------------------------------|-------
GPL-2.0 11139
and resulted in the first patch in this series.
If that file was a */uapi/* path one, it was "GPL-2.0 WITH
Linux-syscall-note" otherwise it was "GPL-2.0". Results of that was:
SPDX license identifier # files
---------------------------------------------------|-------
GPL-2.0 WITH Linux-syscall-note 930
and resulted in the second patch in this series.
- if a file had some form of licensing information in it, and was one
of the */uapi/* ones, it was denoted with the Linux-syscall-note if
any GPL family license was found in the file or had no licensing in
it (per prior point). Results summary:
SPDX license identifier # files
---------------------------------------------------|------
GPL-2.0 WITH Linux-syscall-note 270
GPL-2.0+ WITH Linux-syscall-note 169
((GPL-2.0 WITH Linux-syscall-note) OR BSD-2-Clause) 21
((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) 17
LGPL-2.1+ WITH Linux-syscall-note 15
GPL-1.0+ WITH Linux-syscall-note 14
((GPL-2.0+ WITH Linux-syscall-note) OR BSD-3-Clause) 5
LGPL-2.0+ WITH Linux-syscall-note 4
LGPL-2.1 WITH Linux-syscall-note 3
((GPL-2.0 WITH Linux-syscall-note) OR MIT) 3
((GPL-2.0 WITH Linux-syscall-note) AND MIT) 1
and that resulted in the third patch in this series.
- when the two scanners agreed on the detected license(s), that became
the concluded license(s).
- when there was disagreement between the two scanners (one detected a
license but the other didn't, or they both detected different
licenses) a manual inspection of the file occurred.
- In most cases a manual inspection of the information in the file
resulted in a clear resolution of the license that should apply (and
which scanner probably needed to revisit its heuristics).
- When it was not immediately clear, the license identifier was
confirmed with lawyers working with the Linux Foundation.
- If there was any question as to the appropriate license identifier,
the file was flagged for further research and to be revisited later
in time.
In total, over 70 hours of logged manual review was done on the
spreadsheet to determine the SPDX license identifiers to apply to the
source files by Kate, Philippe, Thomas and, in some cases, confirmation
by lawyers working with the Linux Foundation.
Kate also obtained a third independent scan of the 4.13 code base from
FOSSology, and compared selected files where the other two scanners
disagreed against that SPDX file, to see if there was new insights. The
Windriver scanner is based on an older version of FOSSology in part, so
they are related.
Thomas did random spot checks in about 500 files from the spreadsheets
for the uapi headers and agreed with SPDX license identifier in the
files he inspected. For the non-uapi files Thomas did random spot checks
in about 15000 files.
In initial set of patches against 4.14-rc6, 3 files were found to have
copy/paste license identifier errors, and have been fixed to reflect the
correct identifier.
Additionally Philippe spent 10 hours this week doing a detailed manual
inspection and review of the 12,461 patched files from the initial patch
version early this week with:
- a full scancode scan run, collecting the matched texts, detected
license ids and scores
- reviewing anything where there was a license detected (about 500+
files) to ensure that the applied SPDX license was correct
- reviewing anything where there was no detection but the patch license
was not GPL-2.0 WITH Linux-syscall-note to ensure that the applied
SPDX license was correct
This produced a worksheet with 20 files needing minor correction. This
worksheet was then exported into 3 different .csv files for the
different types of files to be modified.
These .csv files were then reviewed by Greg. Thomas wrote a script to
parse the csv files and add the proper SPDX tag to the file, in the
format that the file expected. This script was further refined by Greg
based on the output to detect more types of files automatically and to
distinguish between header and source .c files (which need different
comment types.) Finally Greg ran the script using the .csv files to
generate the patches.
Reviewed-by: Kate Stewart <kstewart@linuxfoundation.org>
Reviewed-by: Philippe Ombredanne <pombredanne@nexb.com>
Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-11-01 22:07:57 +08:00
|
|
|
/* SPDX-License-Identifier: GPL-2.0 */
|
parisc: Add <asm/hash.h>
PA-RISC is interesting; integer multiplies are implemented in the
FPU, so are painful in the kernel. But it tries to be friendly to
shift-and-add sequences for constant multiplies.
__hash_32 is implemented using the same shift-and-add sequence as
Microblaze, just scheduled for the PA7100. (It's 2-way superscalar
but in-order, like the Pentium.)
hash_64 was tricky, but a suggestion from Jason Thong allowed a
good solution by breaking up the multiplier. After a lot of manual
optimization, I found a 19-instruction sequence for the multiply that
can be executed in 10 cycles using only 4 temporaries.
(The PA8xxx can issue 4 instructions per cycle, but 2 must be ALU ops
and 2 must be loads/stores. And the final add can't be paired.)
An alternative considered, but ultimately not used, was Thomas Wang's
64-to-32-bit integer hash. At 12 instructions, it's smaller, but they're
all sequentially dependent, so it has longer latency.
https://web.archive.org/web/2011/http://www.concentric.net/~Ttwang/tech/inthash.htm
http://burtleburtle.net/bob/hash/integer.html
Signed-off-by: George Spelvin <linux@sciencehorizons.net>
Cc: Helge Deller <deller@gmx.de>
Cc: linux-parisc@vger.kernel.org
Signed-off-by: Helge Deller <deller@gmx.de>
2016-06-08 07:45:06 +08:00
|
|
|
#ifndef _ASM_HASH_H
|
|
|
|
#define _ASM_HASH_H
|
|
|
|
|
|
|
|
/*
|
|
|
|
* HP-PA only implements integer multiply in the FPU. However, for
|
|
|
|
* integer multiplies by constant, it has a number of shift-and-add
|
|
|
|
* (but no shift-and-subtract, sigh!) instructions that a compiler
|
|
|
|
* can synthesize a code sequence with.
|
|
|
|
*
|
|
|
|
* Unfortunately, GCC isn't very efficient at using them. For example
|
|
|
|
* it uses three instructions for "x *= 21" when only two are needed.
|
|
|
|
* But we can find a sequence manually.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#define HAVE_ARCH__HASH_32 1
|
|
|
|
|
|
|
|
/*
|
|
|
|
* This is a multiply by GOLDEN_RATIO_32 = 0x61C88647 optimized for the
|
|
|
|
* PA7100 pairing rules. This is an in-order 2-way superscalar processor.
|
|
|
|
* Only one instruction in a pair may be a shift (by more than 3 bits),
|
|
|
|
* but other than that, simple ALU ops (including shift-and-add by up
|
|
|
|
* to 3 bits) may be paired arbitrarily.
|
|
|
|
*
|
|
|
|
* PA8xxx processors also dual-issue ALU instructions, although with
|
|
|
|
* fewer constraints, so this schedule is good for them, too.
|
|
|
|
*
|
|
|
|
* This 6-step sequence was found by Yevgen Voronenko's implementation
|
|
|
|
* of the Hcub algorithm at http://spiral.ece.cmu.edu/mcm/gen.html.
|
|
|
|
*/
|
|
|
|
static inline u32 __attribute_const__ __hash_32(u32 x)
|
|
|
|
{
|
|
|
|
u32 a, b, c;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Phase 1: Compute a = (x << 19) + x,
|
|
|
|
* b = (x << 9) + a, c = (x << 23) + b.
|
|
|
|
*/
|
|
|
|
a = x << 19; /* Two shifts can't be paired */
|
|
|
|
b = x << 9; a += x;
|
|
|
|
c = x << 23; b += a;
|
|
|
|
c += b;
|
|
|
|
/* Phase 2: Return (b<<11) + (c<<6) + (a<<3) - c */
|
|
|
|
b <<= 11;
|
|
|
|
a += c << 3; b -= c;
|
|
|
|
return (a << 3) + b;
|
|
|
|
}
|
|
|
|
|
|
|
|
#if BITS_PER_LONG == 64
|
|
|
|
|
|
|
|
#define HAVE_ARCH_HASH_64 1
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Finding a good shift-and-add chain for GOLDEN_RATIO_64 is tricky,
|
|
|
|
* because available software for the purpose chokes on constants this
|
|
|
|
* large. (It's mostly designed for compiling FIR filter coefficients
|
|
|
|
* into FPGAs.)
|
|
|
|
*
|
|
|
|
* However, Jason Thong pointed out a work-around. The Hcub software
|
|
|
|
* (http://spiral.ece.cmu.edu/mcm/gen.html) is designed for *multiple*
|
|
|
|
* constant multiplication, and is good at finding shift-and-add chains
|
|
|
|
* which share common terms.
|
|
|
|
*
|
|
|
|
* Looking at 0x0x61C8864680B583EB in binary:
|
|
|
|
* 0110000111001000100001100100011010000000101101011000001111101011
|
|
|
|
* \______________/ \__________/ \_______/ \________/
|
|
|
|
* \____________________________/ \____________________/
|
|
|
|
* you can see the non-zero bits are divided into several well-separated
|
|
|
|
* blocks. Hcub can find algorithms for those terms separately, which
|
|
|
|
* can then be shifted and added together.
|
|
|
|
*
|
|
|
|
* Dividing the input into 2, 3 or 4 blocks, Hcub can find solutions
|
|
|
|
* with 10, 9 or 8 adds, respectively, making a total of 11 for the
|
|
|
|
* whole number.
|
|
|
|
*
|
|
|
|
* Using just two large blocks, 0xC3910C8D << 31 in the high bits,
|
|
|
|
* and 0xB583EB in the low bits, produces as good an algorithm as any,
|
|
|
|
* and with one more small shift than alternatives.
|
|
|
|
*
|
|
|
|
* The high bits are a larger number and more work to compute, as well
|
|
|
|
* as needing one extra cycle to shift left 31 bits before the final
|
|
|
|
* addition, so they are the critical path for scheduling. The low bits
|
|
|
|
* can fit into the scheduling slots left over.
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* This _ASSIGN(dst, src) macro performs "dst = src", but prevents GCC
|
|
|
|
* from inferring anything about the value assigned to "dest".
|
|
|
|
*
|
|
|
|
* This prevents it from mis-optimizing certain sequences.
|
|
|
|
* In particular, gcc is annoyingly eager to combine consecutive shifts.
|
|
|
|
* Given "x <<= 19; y += x; z += x << 1;", GCC will turn this into
|
|
|
|
* "y += x << 19; z += x << 20;" even though the latter sequence needs
|
|
|
|
* an additional instruction and temporary register.
|
|
|
|
*
|
|
|
|
* Because no actual assembly code is generated, this construct is
|
|
|
|
* usefully portable across all GCC platforms, and so can be test-compiled
|
|
|
|
* on non-PA systems.
|
|
|
|
*
|
|
|
|
* In two places, additional unused input dependencies are added. This
|
|
|
|
* forces GCC's scheduling so it does not rearrange instructions too much.
|
|
|
|
* Because the PA-8xxx is out of order, I'm not sure how much this matters,
|
|
|
|
* but why make it more difficult for the processor than necessary?
|
|
|
|
*/
|
|
|
|
#define _ASSIGN(dst, src, ...) asm("" : "=r" (dst) : "0" (src), ##__VA_ARGS__)
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Multiply by GOLDEN_RATIO_64 = 0x0x61C8864680B583EB using a heavily
|
|
|
|
* optimized shift-and-add sequence.
|
|
|
|
*
|
|
|
|
* Without the final shift, the multiply proper is 19 instructions,
|
|
|
|
* 10 cycles and uses only 4 temporaries. Whew!
|
|
|
|
*
|
|
|
|
* You are not expected to understand this.
|
|
|
|
*/
|
|
|
|
static __always_inline u32 __attribute_const__
|
|
|
|
hash_64(u64 a, unsigned int bits)
|
|
|
|
{
|
|
|
|
u64 b, c, d;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Encourage GCC to move a dynamic shift to %sar early,
|
|
|
|
* thereby freeing up an additional temporary register.
|
|
|
|
*/
|
|
|
|
if (!__builtin_constant_p(bits))
|
|
|
|
asm("" : "=q" (bits) : "0" (64 - bits));
|
|
|
|
else
|
|
|
|
bits = 64 - bits;
|
|
|
|
|
|
|
|
_ASSIGN(b, a*5); c = a << 13;
|
|
|
|
b = (b << 2) + a; _ASSIGN(d, a << 17);
|
|
|
|
a = b + (a << 1); c += d;
|
|
|
|
d = a << 10; _ASSIGN(a, a << 19);
|
|
|
|
d = a - d; _ASSIGN(a, a << 4, "X" (d));
|
|
|
|
c += b; a += b;
|
|
|
|
d -= c; c += a << 1;
|
|
|
|
a += c << 3; _ASSIGN(b, b << (7+31), "X" (c), "X" (d));
|
|
|
|
a <<= 31; b += d;
|
|
|
|
a += b;
|
|
|
|
return a >> bits;
|
|
|
|
}
|
|
|
|
#undef _ASSIGN /* We're a widely-used header file, so don't litter! */
|
|
|
|
|
|
|
|
#endif /* BITS_PER_LONG == 64 */
|
|
|
|
|
|
|
|
#endif /* _ASM_HASH_H */
|