From 8c6bd03a95a96129ea2ed2edc3b02ff056fcbdbc Mon Sep 17 00:00:00 2001 From: Administrator Date: Mon, 21 Sep 2020 19:47:14 +0200 Subject: [PATCH 1/6] Add new file --- .gitlab-ci.yml | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 000000000..472d2d5c3 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,35 @@ +stages: + - build + +.build_template: + stage: build + script: + - make all + only: + - web + - schedules + +build_ubuntu1804: + extends: .build_template + tags: + - ubuntu1804 + +build_ubuntu2004: + extends: .build_template + tags: + - ubuntu2004 + +build_vc191x: + extends: .build_template + tags: + - vc191x + +build_vc192x: + extends: .build_template + tags: + - vc192x + +build_macos: + extends: .build_template + tags: + - macos From f39147b36118f2800b175ed37211733b5e48a179 Mon Sep 17 00:00:00 2001 From: Administrator Date: Mon, 21 Sep 2020 19:48:10 +0200 Subject: [PATCH 2/6] Add new file --- .gitlab-ci-internal.yml | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 .gitlab-ci-internal.yml diff --git a/.gitlab-ci-internal.yml b/.gitlab-ci-internal.yml new file mode 100644 index 000000000..472d2d5c3 --- /dev/null +++ b/.gitlab-ci-internal.yml @@ -0,0 +1,35 @@ +stages: + - build + +.build_template: + stage: build + script: + - make all + only: + - web + - schedules + +build_ubuntu1804: + extends: .build_template + tags: + - ubuntu1804 + +build_ubuntu2004: + extends: .build_template + tags: + - ubuntu2004 + +build_vc191x: + extends: .build_template + tags: + - vc191x + +build_vc192x: + extends: .build_template + tags: + - vc192x + +build_macos: + extends: .build_template + tags: + - macos From b1aae7361cc7eccd0672f1b6d97ac54bf8f2d0fe Mon Sep 17 00:00:00 2001 From: Administrator Date: Mon, 21 Sep 2020 19:55:44 +0200 Subject: [PATCH 3/6] Delete .gitlab-ci.yml --- .gitlab-ci.yml | 35 ----------------------------------- 1 file changed, 35 deletions(-) delete mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml deleted file mode 100644 index 472d2d5c3..000000000 --- a/.gitlab-ci.yml +++ /dev/null @@ -1,35 +0,0 @@ -stages: - - build - -.build_template: - stage: build - script: - - make all - only: - - web - - schedules - -build_ubuntu1804: - extends: .build_template - tags: - - ubuntu1804 - -build_ubuntu2004: - extends: .build_template - tags: - - ubuntu2004 - -build_vc191x: - extends: .build_template - tags: - - vc191x - -build_vc192x: - extends: .build_template - tags: - - vc192x - -build_macos: - extends: .build_template - tags: - - macos From 8ec8ee5bccb614136e6295e09144944b84e31b6a Mon Sep 17 00:00:00 2001 From: Administrator Date: Mon, 21 Sep 2020 20:02:54 +0200 Subject: [PATCH 4/6] Delete .gitlab-ci-internal.yml --- .gitlab-ci-internal.yml | 35 ----------------------------------- 1 file changed, 35 deletions(-) delete mode 100644 .gitlab-ci-internal.yml diff --git a/.gitlab-ci-internal.yml b/.gitlab-ci-internal.yml deleted file mode 100644 index 472d2d5c3..000000000 --- a/.gitlab-ci-internal.yml +++ /dev/null @@ -1,35 +0,0 @@ -stages: - - build - -.build_template: - stage: build - script: - - make all - only: - - web - - schedules - -build_ubuntu1804: - extends: .build_template - tags: - - ubuntu1804 - -build_ubuntu2004: - extends: .build_template - tags: - - ubuntu2004 - -build_vc191x: - extends: .build_template - tags: - - vc191x - -build_vc192x: - extends: .build_template - tags: - - vc192x - -build_macos: - extends: .build_template - tags: - - macos From 2ad8f7285ec5d012fb36b00a8ac2f044d888c037 Mon Sep 17 00:00:00 2001 From: Valeri George Date: Tue, 6 Oct 2020 17:00:56 +0200 Subject: [PATCH 5/6] FIX for speed loss in vvencapp: first initialization of SIMD part added --- source/Lib/CommonLib/TrQuant_EMT.h | 4 ++-- source/Lib/CommonLib/x86/InitX86.cpp | 10 +++++----- source/Lib/CommonLib/x86/TrafoX86.h | 4 ++-- source/Lib/DecoderLib/DecLib.cpp | 2 +- source/Lib/vvenc/EncoderIf.cpp | 2 +- source/Lib/vvenc/vvenc.cpp | 4 ++++ 6 files changed, 15 insertions(+), 11 deletions(-) diff --git a/source/Lib/CommonLib/TrQuant_EMT.h b/source/Lib/CommonLib/TrQuant_EMT.h index 86d24c6f2..5c5bf846e 100644 --- a/source/Lib/CommonLib/TrQuant_EMT.h +++ b/source/Lib/CommonLib/TrQuant_EMT.h @@ -57,9 +57,9 @@ struct TCoeffOps { TCoeffOps(); - void initTCoeffOps(); + void initTCoeffOpsX86(); template - void _initTCoeffOps(); + void _initTCoeffOpsX86(); void( *cpyResi8 ) ( const TCoeff* src, Pel* dst, ptrdiff_t stride, unsigned width, unsigned height ); void( *cpyResi4 ) ( const TCoeff* src, Pel* dst, ptrdiff_t stride, unsigned width, unsigned height ); diff --git a/source/Lib/CommonLib/x86/InitX86.cpp b/source/Lib/CommonLib/x86/InitX86.cpp index 4f620fb62..335ce522c 100644 --- a/source/Lib/CommonLib/x86/InitX86.cpp +++ b/source/Lib/CommonLib/x86/InitX86.cpp @@ -303,22 +303,22 @@ void MCTF::initMCTF_X86() #endif #if ENABLE_SIMD_TRAFO -void TCoeffOps::initTCoeffOps() +void TCoeffOps::initTCoeffOpsX86() { auto vext = read_x86_extension_flags(); switch (vext){ case AVX512: case AVX2: - _initTCoeffOps(); + _initTCoeffOpsX86(); break; case AVX: - _initTCoeffOps(); + _initTCoeffOpsX86(); break; case SSE42: - _initTCoeffOps(); + _initTCoeffOpsX86(); break; case SSE41: - _initTCoeffOps(); + _initTCoeffOpsX86(); break; default: break; diff --git a/source/Lib/CommonLib/x86/TrafoX86.h b/source/Lib/CommonLib/x86/TrafoX86.h index 9bbb0801f..60f764323 100644 --- a/source/Lib/CommonLib/x86/TrafoX86.h +++ b/source/Lib/CommonLib/x86/TrafoX86.h @@ -772,7 +772,7 @@ void cpyCoeff_SSE( const Pel* src, ptrdiff_t stride, TCoeff* dst, unsigned width } template -void TCoeffOps::_initTCoeffOps() +void TCoeffOps::_initTCoeffOpsX86() { cpyResi4 = cpyResi_SSE ; cpyResi8 = cpyResi_SSE ; @@ -788,7 +788,7 @@ void TCoeffOps::_initTCoeffOps() = fastFwd_SSE ; } -template void TCoeffOps::_initTCoeffOps(); +template void TCoeffOps::_initTCoeffOpsX86(); } diff --git a/source/Lib/DecoderLib/DecLib.cpp b/source/Lib/DecoderLib/DecLib.cpp index 38c1c7e55..62017be2f 100644 --- a/source/Lib/DecoderLib/DecLib.cpp +++ b/source/Lib/DecoderLib/DecLib.cpp @@ -412,7 +412,7 @@ DecLib::DecLib() g_pelBufOP.initPelBufOpsX86(); #endif #if ENABLE_SIMD_TRAFO - g_tCoeffOps.initTCoeffOps(); + g_tCoeffOps.initTCoeffOpsX86(); #endif } diff --git a/source/Lib/vvenc/EncoderIf.cpp b/source/Lib/vvenc/EncoderIf.cpp index 8d03e4c18..adea8e3f4 100644 --- a/source/Lib/vvenc/EncoderIf.cpp +++ b/source/Lib/vvenc/EncoderIf.cpp @@ -117,7 +117,7 @@ std::string setSIMDExtension( const std::string& simdId ) g_pelBufOP.initPelBufOpsX86(); #endif #if ENABLE_SIMD_TRAFO - g_tCoeffOps.initTCoeffOps(); + g_tCoeffOps.initTCoeffOpsX86(); #endif return ret; } diff --git a/source/Lib/vvenc/vvenc.cpp b/source/Lib/vvenc/vvenc.cpp index 364714cd0..01e275549 100644 --- a/source/Lib/vvenc/vvenc.cpp +++ b/source/Lib/vvenc/vvenc.cpp @@ -92,6 +92,10 @@ int VVEnc::init( const VVEncParameter& rcVVEncParameter ) return iRet; } + // Set SIMD extension in case if it hasn't been done before, otherwise it simply reuses the current state + std::string simdOpt; + vvenc::setSIMDExtension( simdOpt ); + return VVENC_OK; } From 466b2e344e97014934af58f78c8bf885f06431cf Mon Sep 17 00:00:00 2001 From: Adam Wieckowski Date: Thu, 8 Oct 2020 16:45:29 +0200 Subject: [PATCH 6/6] bump version --- include/vvenc/version.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/vvenc/version.h b/include/vvenc/version.h index 62f8c519a..eb3473aed 100644 --- a/include/vvenc/version.h +++ b/include/vvenc/version.h @@ -42,11 +42,11 @@ vvc@hhi.fraunhofer.de #if !defined( VVENC_VERSION ) -#define VVENC_VERSION "0.1.0.0" +#define VVENC_VERSION "0.1.0.1" #ifdef _WIN32 -#define VVENC_VS_VERSION 0.1.0.0 -#define VVENC_VS_VERSION_STR "0.1.0.0" +#define VVENC_VS_VERSION 0.1.0.1 +#define VVENC_VS_VERSION_STR "0.1.0.1" #endif #endif