From 4e044d4142b9bd117246c88a24a6335aa9de2b49 Mon Sep 17 00:00:00 2001 From: Konstantinos Margaritis Date: Tue, 12 Oct 2021 10:55:33 +0300 Subject: [PATCH] Add missing copyright info from tampered files --- benchmarks/benchmarks.cpp | 28 ++++++++++++++++++++++++++++ benchmarks/benchmarks.hpp | 28 ++++++++++++++++++++++++++++ src/hwlm/noodle_engine.cpp | 1 + src/nfa/truffle.cpp | 5 ++--- src/nfa/x86/shufti.hpp | 2 -- src/util/arch/arm/arm.h | 1 + src/util/arch/arm/bitutils.h | 1 + src/util/arch/arm/cpuid_flags.c | 1 + src/util/arch/arm/simd_types.h | 1 + src/util/arch/arm/simd_utils.h | 1 + src/util/arch/common/bitutils.h | 1 + src/util/arch/common/cpuid_flags.h | 1 + src/util/arch/common/simd_utils.h | 1 + src/util/arch/common/simd_utils.hpp | 0 src/util/arch/x86/bitutils.h | 1 + src/util/arch/x86/cpuid_flags.c | 1 + src/util/arch/x86/cpuid_inline.h | 1 + src/util/arch/x86/crc32.h | 3 ++- src/util/arch/x86/masked_move.c | 1 + src/util/arch/x86/masked_move.h | 1 + src/util/arch/x86/simd_types.h | 1 + src/util/arch/x86/simd_utils.h | 1 + src/util/arch/x86/x86.h | 1 + src/util/popcount.h | 1 + src/util/state_compress.c | 1 + 25 files changed, 79 insertions(+), 6 deletions(-) delete mode 100644 src/util/arch/common/simd_utils.hpp diff --git a/benchmarks/benchmarks.cpp b/benchmarks/benchmarks.cpp index b10351cb..49990bd7 100644 --- a/benchmarks/benchmarks.cpp +++ b/benchmarks/benchmarks.cpp @@ -1,3 +1,31 @@ +/* + * Copyright (c) 2020, 2021, VectorCamp PC + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of Intel Corporation nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + #include #include #include diff --git a/benchmarks/benchmarks.hpp b/benchmarks/benchmarks.hpp index 88fcf8df..37326523 100644 --- a/benchmarks/benchmarks.hpp +++ b/benchmarks/benchmarks.hpp @@ -1,3 +1,31 @@ +/* + * Copyright (c) 2020, 2021, VectorCamp PC + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of Intel Corporation nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + #include "nfa/shufti.h" #include "nfa/shufticompile.h" #include "nfa/truffle.h" diff --git a/src/hwlm/noodle_engine.cpp b/src/hwlm/noodle_engine.cpp index f898c7b7..33788ab4 100644 --- a/src/hwlm/noodle_engine.cpp +++ b/src/hwlm/noodle_engine.cpp @@ -1,5 +1,6 @@ /* * Copyright (c) 2015-2017, Intel Corporation + * Copyright (c) 2020, 2021, VectorCamp PC * Copyright (c) 2021, Arm Limited * * Redistribution and use in source and binary forms, with or without diff --git a/src/nfa/truffle.cpp b/src/nfa/truffle.cpp index 6a8d3c2e..c8391445 100644 --- a/src/nfa/truffle.cpp +++ b/src/nfa/truffle.cpp @@ -1,5 +1,6 @@ /* * Copyright (c) 2015-2017, Intel Corporation + * Copyright (c) 2020, 2021, VectorCamp PC * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: @@ -27,9 +28,7 @@ */ /** \file - * \brief Shufti: character class acceleration. - * - * Utilises the SSSE3 pshufb shuffle instruction + * \brief Truffle: character class acceleration. */ #include "truffle.h" diff --git a/src/nfa/x86/shufti.hpp b/src/nfa/x86/shufti.hpp index fa18cc2a..79ef7481 100644 --- a/src/nfa/x86/shufti.hpp +++ b/src/nfa/x86/shufti.hpp @@ -1,7 +1,6 @@ /* * Copyright (c) 2015-2017, Intel Corporation * Copyright (c) 2020-2021, VectorCamp PC - * Copyright (c) 2021, Arm Limited * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: @@ -30,7 +29,6 @@ /** \file * \brief Shufti: character class acceleration. - * */ #ifndef SHUFTI_SIMD_X86_HPP diff --git a/src/util/arch/arm/arm.h b/src/util/arch/arm/arm.h index 42763e16..2ec55da2 100644 --- a/src/util/arch/arm/arm.h +++ b/src/util/arch/arm/arm.h @@ -1,5 +1,6 @@ /* * Copyright (c) 2017-2020, Intel Corporation + * Copyright (c) 2020-2021, VectorCamp PC * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: diff --git a/src/util/arch/arm/bitutils.h b/src/util/arch/arm/bitutils.h index a2f98c99..5ef5fbf4 100644 --- a/src/util/arch/arm/bitutils.h +++ b/src/util/arch/arm/bitutils.h @@ -1,5 +1,6 @@ /* * Copyright (c) 2015-2017, Intel Corporation + * Copyright (c) 2020-2021, VectorCamp PC * Copyright (c) 2021, Arm Limited * * Redistribution and use in source and binary forms, with or without diff --git a/src/util/arch/arm/cpuid_flags.c b/src/util/arch/arm/cpuid_flags.c index 1ba1a497..66040f83 100644 --- a/src/util/arch/arm/cpuid_flags.c +++ b/src/util/arch/arm/cpuid_flags.c @@ -1,5 +1,6 @@ /* * Copyright (c) 2015-2017, Intel Corporation + * Copyright (c) 2020-2021, VectorCamp PC * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: diff --git a/src/util/arch/arm/simd_types.h b/src/util/arch/arm/simd_types.h index cc4c50e4..7dafcf58 100644 --- a/src/util/arch/arm/simd_types.h +++ b/src/util/arch/arm/simd_types.h @@ -1,5 +1,6 @@ /* * Copyright (c) 2015-2017, Intel Corporation + * Copyright (c) 2020-2021, VectorCamp PC * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: diff --git a/src/util/arch/arm/simd_utils.h b/src/util/arch/arm/simd_utils.h index 052319f6..24851773 100644 --- a/src/util/arch/arm/simd_utils.h +++ b/src/util/arch/arm/simd_utils.h @@ -1,5 +1,6 @@ /* * Copyright (c) 2015-2020, Intel Corporation + * Copyright (c) 2020-2021, VectorCamp PC * Copyright (c) 2021, Arm Limited * * Redistribution and use in source and binary forms, with or without diff --git a/src/util/arch/common/bitutils.h b/src/util/arch/common/bitutils.h index 723e4a18..e5ff5bc1 100644 --- a/src/util/arch/common/bitutils.h +++ b/src/util/arch/common/bitutils.h @@ -1,5 +1,6 @@ /* * Copyright (c) 2015-2017, Intel Corporation + * Copyright (c) 2020-2021, VectorCamp PC * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: diff --git a/src/util/arch/common/cpuid_flags.h b/src/util/arch/common/cpuid_flags.h index a9a57b6f..c1bbdc66 100644 --- a/src/util/arch/common/cpuid_flags.h +++ b/src/util/arch/common/cpuid_flags.h @@ -1,5 +1,6 @@ /* * Copyright (c) 2015-2017, Intel Corporation + * Copyright (c) 2020-2021, VectorCamp PC * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: diff --git a/src/util/arch/common/simd_utils.h b/src/util/arch/common/simd_utils.h index 8a3b52cf..65e7b69a 100644 --- a/src/util/arch/common/simd_utils.h +++ b/src/util/arch/common/simd_utils.h @@ -1,5 +1,6 @@ /* * Copyright (c) 2015-2020, Intel Corporation + * Copyright (c) 2020-2021, VectorCamp PC * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: diff --git a/src/util/arch/common/simd_utils.hpp b/src/util/arch/common/simd_utils.hpp deleted file mode 100644 index e69de29b..00000000 diff --git a/src/util/arch/x86/bitutils.h b/src/util/arch/x86/bitutils.h index 8ce852ac..5c15ee91 100644 --- a/src/util/arch/x86/bitutils.h +++ b/src/util/arch/x86/bitutils.h @@ -1,5 +1,6 @@ /* * Copyright (c) 2015-2017, Intel Corporation + * Copyright (c) 2020-2021, VectorCamp PC * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: diff --git a/src/util/arch/x86/cpuid_flags.c b/src/util/arch/x86/cpuid_flags.c index 9b56fc22..92c297b8 100644 --- a/src/util/arch/x86/cpuid_flags.c +++ b/src/util/arch/x86/cpuid_flags.c @@ -1,5 +1,6 @@ /* * Copyright (c) 2015-2020, Intel Corporation + * Copyright (c) 2020-2021, VectorCamp PC * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: diff --git a/src/util/arch/x86/cpuid_inline.h b/src/util/arch/x86/cpuid_inline.h index bc080ba5..d5ff210c 100644 --- a/src/util/arch/x86/cpuid_inline.h +++ b/src/util/arch/x86/cpuid_inline.h @@ -1,5 +1,6 @@ /* * Copyright (c) 2017-2020, Intel Corporation + * Copyright (c) 2020-2021, VectorCamp PC * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: diff --git a/src/util/arch/x86/crc32.h b/src/util/arch/x86/crc32.h index d5e7d424..61bdbf6f 100644 --- a/src/util/arch/x86/crc32.h +++ b/src/util/arch/x86/crc32.h @@ -1,5 +1,6 @@ /* * Copyright (c) 2015-2017, Intel Corporation + * Copyright (c) 2020-2021, VectorCamp PC * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: @@ -79,4 +80,4 @@ u32 crc32c_sse42(u32 running_crc, const unsigned char* p_buf, return crc; } -#endif // UTIL_ARCH_X86_CRC32_H_ \ No newline at end of file +#endif // UTIL_ARCH_X86_CRC32_H_ diff --git a/src/util/arch/x86/masked_move.c b/src/util/arch/x86/masked_move.c index 001cd49f..b6ddc51e 100644 --- a/src/util/arch/x86/masked_move.c +++ b/src/util/arch/x86/masked_move.c @@ -1,5 +1,6 @@ /* * Copyright (c) 2015-2017, Intel Corporation + * Copyright (c) 2020-2021, VectorCamp PC * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: diff --git a/src/util/arch/x86/masked_move.h b/src/util/arch/x86/masked_move.h index c46ad144..4787ffa9 100644 --- a/src/util/arch/x86/masked_move.h +++ b/src/util/arch/x86/masked_move.h @@ -1,5 +1,6 @@ /* * Copyright (c) 2015-2017, Intel Corporation + * Copyright (c) 2020-2021, VectorCamp PC * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: diff --git a/src/util/arch/x86/simd_types.h b/src/util/arch/x86/simd_types.h index d7984a72..c04e8dab 100644 --- a/src/util/arch/x86/simd_types.h +++ b/src/util/arch/x86/simd_types.h @@ -1,5 +1,6 @@ /* * Copyright (c) 2015-2017, Intel Corporation + * Copyright (c) 2020-2021, VectorCamp PC * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: diff --git a/src/util/arch/x86/simd_utils.h b/src/util/arch/x86/simd_utils.h index b36d5a38..c4a3b97c 100644 --- a/src/util/arch/x86/simd_utils.h +++ b/src/util/arch/x86/simd_utils.h @@ -1,5 +1,6 @@ /* * Copyright (c) 2015-2020, Intel Corporation + * Copyright (c) 2020-2021, VectorCamp PC * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: diff --git a/src/util/arch/x86/x86.h b/src/util/arch/x86/x86.h index d386981a..d08f979f 100644 --- a/src/util/arch/x86/x86.h +++ b/src/util/arch/x86/x86.h @@ -1,5 +1,6 @@ /* * Copyright (c) 2017-2020, Intel Corporation + * Copyright (c) 2020-2021, VectorCamp PC * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: diff --git a/src/util/popcount.h b/src/util/popcount.h index 7dc2eb9a..c7a69d46 100644 --- a/src/util/popcount.h +++ b/src/util/popcount.h @@ -1,5 +1,6 @@ /* * Copyright (c) 2015-2017, Intel Corporation + * Copyright (c) 2020-2021, VectorCamp PC * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: diff --git a/src/util/state_compress.c b/src/util/state_compress.c index 729eedb3..fda54112 100644 --- a/src/util/state_compress.c +++ b/src/util/state_compress.c @@ -1,5 +1,6 @@ /* * Copyright (c) 2015-2017, Intel Corporation + * Copyright (c) 2020-2021, VectorCamp PC * Copyright (c) 2021, Arm Limited * * Redistribution and use in source and binary forms, with or without