From b9bd014a44080b3d9dbc1062553546fcd07ab256 Mon Sep 17 00:00:00 2001 From: Compute-Runtime-Automation Date: Tue, 20 Jul 2021 17:17:32 +0200 Subject: [PATCH] Add fixes to build with gcc11 (#5325) * remove Fedora 31 and 32 builds Signed-off-by: Jacek Danecki * Add builds on Fedora 33 and 34 Signed-off-by: Jacek Danecki * Fix build with gcc11 Signed-off-by: Jacek Danecki * Remove info about EOL'd distributions Signed-off-by: Jacek Danecki * clean after build Signed-off-by: Jacek Danecki Co-authored-by: Jacek Danecki --- level_zero/doc/DISTRIBUTIONS.md | 2 +- opencl/doc/DISTRIBUTIONS.md | 2 +- opencl/test/unit_test/api/cl_enqueue_image_tests.inl | 6 +++--- .../api/cl_enqueue_write_buffer_rect_tests.inl | 8 ++++---- ...l_max_concurrent_work_group_count_intel_tests.inl | 4 ++-- ..._kernel_suggested_local_work_size_intel_tests.inl | 2 +- .../unit_test/api/cl_set_kernel_exec_info_tests.inl | 2 +- .../unit_test/command_queue/enqueue_svm_tests.cpp | 8 ++++---- opencl/test/unit_test/helpers/cmd_buffer_validator.h | 2 +- .../test/unit_test/memory_manager/surface_tests.cpp | 6 +++--- scripts/build-fedora31-copr-docker.sh | 12 ------------ scripts/build-fedora32-copr-docker.sh | 12 ------------ scripts/build-fedora33-copr-docker.sh | 12 ++++++++++++ scripts/build-fedora34-copr-docker.sh | 12 ++++++++++++ ...file-fedora-31-copr => Dockerfile-fedora-33-copr} | 12 +++++++----- ...file-fedora-32-copr => Dockerfile-fedora-34-copr} | 12 +++++++----- .../patchtokens_decoder_tests.cpp | 8 ++++---- 17 files changed, 63 insertions(+), 59 deletions(-) delete mode 100755 scripts/build-fedora31-copr-docker.sh delete mode 100755 scripts/build-fedora32-copr-docker.sh create mode 100755 scripts/build-fedora33-copr-docker.sh create mode 100755 scripts/build-fedora34-copr-docker.sh rename scripts/docker/{Dockerfile-fedora-31-copr => Dockerfile-fedora-33-copr} (56%) rename scripts/docker/{Dockerfile-fedora-32-copr => Dockerfile-fedora-34-copr} (56%) diff --git a/level_zero/doc/DISTRIBUTIONS.md b/level_zero/doc/DISTRIBUTIONS.md index f0e412e57a..038f591cf7 100644 --- a/level_zero/doc/DISTRIBUTIONS.md +++ b/level_zero/doc/DISTRIBUTIONS.md @@ -16,7 +16,7 @@ yum copr enable jdanecki/intel-opencl yum install level-zero intel-level-zero-gpu ``` -## Fedora* 32, 33, 34, rawhide, Red Hat Enterprise Linux* 8, Mageia* 7, 8 +## Fedora* 33, 34, rawhide, Red Hat Enterprise Linux* 8, Mageia* 8 ``` dnf install dnf-plugins-core diff --git a/opencl/doc/DISTRIBUTIONS.md b/opencl/doc/DISTRIBUTIONS.md index f32306871b..d31423c147 100644 --- a/opencl/doc/DISTRIBUTIONS.md +++ b/opencl/doc/DISTRIBUTIONS.md @@ -36,7 +36,7 @@ swupd bundle-add computer-vision-basic cave resolve --execute intel-compute-runtime ``` -## Fedora* 32, 33, 34, rawhide, Red Hat Enterprise Linux* 8, Mageia* 7, 8 +## Fedora* 33, 34, rawhide, Red Hat Enterprise Linux* 8, Mageia* 8 ``` dnf install dnf-plugins-core diff --git a/opencl/test/unit_test/api/cl_enqueue_image_tests.inl b/opencl/test/unit_test/api/cl_enqueue_image_tests.inl index 5d2323c202..df24b2c5bb 100644 --- a/opencl/test/unit_test/api/cl_enqueue_image_tests.inl +++ b/opencl/test/unit_test/api/cl_enqueue_image_tests.inl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2020 Intel Corporation + * Copyright (C) 2018-2021 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -24,12 +24,12 @@ struct ValidateRegionAndOriginTests : public ::testing::TestWithParampCmdQ->enqueueSVMMemcpy( @@ -480,8 +480,8 @@ HWTEST_F(EnqueueSvmTest, givenDstHostPtrAndSrcHostPtrWhenEnqueueBlockingSVMMemcp } TEST_F(EnqueueSvmTest, givenDstHostPtrAndSrcHostPtrAndSizeZeroWhenEnqueueSVMMemcpyThenReturnSuccess) { - char dstHostPtr[260]; - char srcHostPtr[260]; + char dstHostPtr[260] = {}; + char srcHostPtr[260] = {}; void *pDstSVM = dstHostPtr; void *pSrcSVM = srcHostPtr; retVal = this->pCmdQ->enqueueSVMMemcpy( diff --git a/opencl/test/unit_test/helpers/cmd_buffer_validator.h b/opencl/test/unit_test/helpers/cmd_buffer_validator.h index 171d146b48..128da18883 100644 --- a/opencl/test/unit_test/helpers/cmd_buffer_validator.h +++ b/opencl/test/unit_test/helpers/cmd_buffer_validator.h @@ -58,7 +58,7 @@ struct NamedValidator { }; #define EXPECT_MEMBER(TYPE, FUNC, EXPECTED) \ - NamedValidator { GenericCmdValidatorFUNC)()), &TYPE::FUNC, EXPECTED>::get(), #FUNC } + NamedValidator { GenericCmdValidator, &TYPE::FUNC, EXPECTED>::get(), #FUNC } using Expects = std::vector; diff --git a/opencl/test/unit_test/memory_manager/surface_tests.cpp b/opencl/test/unit_test/memory_manager/surface_tests.cpp index dee2f5375d..3579c5f68b 100644 --- a/opencl/test/unit_test/memory_manager/surface_tests.cpp +++ b/opencl/test/unit_test/memory_manager/surface_tests.cpp @@ -111,21 +111,21 @@ TEST_F(CoherentMemObjSurface, GivenCoherentMemObjWhenCreatingSurfaceFromMemObjTh } TEST(HostPtrSurfaceTest, givenHostPtrSurfaceWhenCreatedWithoutSpecifyingPtrCopyAllowanceThenPtrCopyIsNotAllowed) { - char memory[2]; + char memory[2] = {}; HostPtrSurface surface(memory, sizeof(memory)); EXPECT_FALSE(surface.peekIsPtrCopyAllowed()); } TEST(HostPtrSurfaceTest, givenHostPtrSurfaceWhenCreatedWithPtrCopyAllowedThenQueryReturnsTrue) { - char memory[2]; + char memory[2] = {}; HostPtrSurface surface(memory, sizeof(memory), true); EXPECT_TRUE(surface.peekIsPtrCopyAllowed()); } TEST(HostPtrSurfaceTest, givenHostPtrSurfaceWhenCreatedWithPtrCopyNotAllowedThenQueryReturnsFalse) { - char memory[2]; + char memory[2] = {}; HostPtrSurface surface(memory, sizeof(memory), false); EXPECT_FALSE(surface.peekIsPtrCopyAllowed()); diff --git a/scripts/build-fedora31-copr-docker.sh b/scripts/build-fedora31-copr-docker.sh deleted file mode 100755 index 02d2289d7f..0000000000 --- a/scripts/build-fedora31-copr-docker.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash - -# -# Copyright (C) 2019-2021 Intel Corporation -# -# SPDX-License-Identifier: MIT -# - -git fetch -t -git clone ../compute-runtime neo -docker info -docker build -f scripts/docker/Dockerfile-fedora-31-copr -t neo-fedora-31-copr:ci . diff --git a/scripts/build-fedora32-copr-docker.sh b/scripts/build-fedora32-copr-docker.sh deleted file mode 100755 index cc1648901f..0000000000 --- a/scripts/build-fedora32-copr-docker.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash - -# -# Copyright (C) 2020-2021 Intel Corporation -# -# SPDX-License-Identifier: MIT -# - -git fetch -t -git clone ../compute-runtime neo -docker info -docker build -f scripts/docker/Dockerfile-fedora-32-copr -t neo-fedora-32-copr:ci . diff --git a/scripts/build-fedora33-copr-docker.sh b/scripts/build-fedora33-copr-docker.sh new file mode 100755 index 0000000000..1e2254a9f8 --- /dev/null +++ b/scripts/build-fedora33-copr-docker.sh @@ -0,0 +1,12 @@ +#!/bin/bash +# +# Copyright (C) 2021 Intel Corporation +# +# SPDX-License-Identifier: MIT +# + +git fetch -t +git clone ../compute-runtime neo +docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWORD" +docker build -f scripts/docker/Dockerfile-fedora-33-copr -t neo-fedora-33-copr:ci . + diff --git a/scripts/build-fedora34-copr-docker.sh b/scripts/build-fedora34-copr-docker.sh new file mode 100755 index 0000000000..2bb8b96133 --- /dev/null +++ b/scripts/build-fedora34-copr-docker.sh @@ -0,0 +1,12 @@ +#!/bin/bash +# +# Copyright (C) 2021 Intel Corporation +# +# SPDX-License-Identifier: MIT +# + +git fetch -t +git clone ../compute-runtime neo +docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWORD" +docker build -f scripts/docker/Dockerfile-fedora-34-copr -t neo-fedora-34-copr:ci . + diff --git a/scripts/docker/Dockerfile-fedora-31-copr b/scripts/docker/Dockerfile-fedora-33-copr similarity index 56% rename from scripts/docker/Dockerfile-fedora-31-copr rename to scripts/docker/Dockerfile-fedora-33-copr index d3274ddc41..b9024908b6 100644 --- a/scripts/docker/Dockerfile-fedora-31-copr +++ b/scripts/docker/Dockerfile-fedora-33-copr @@ -1,15 +1,17 @@ -FROM fedora:31 +FROM fedora:33 LABEL maintainer="jacek.danecki@intel.com" COPY neo /root/neo -RUN dnf install -y gcc-c++ cmake ninja-build git pkg-config; \ +RUN df -h; dnf install -y gcc-c++ cmake ninja-build git pkg-config; \ dnf install -y 'dnf-command(copr)'; \ dnf copr enable -y jdanecki/intel-opencl; \ dnf copr enable -y jdanecki/intel-opencl-ci; \ dnf --showduplicate list intel-igc-opencl-devel intel-gmmlib-devel; \ dnf install -y intel-igc-opencl-devel intel-gmmlib-devel; \ - mkdir /root/build; cd /root/build ; cmake -G Ninja \ - -DBUILD_WITH_L0=FALSE -DDO_NOT_RUN_AUB_TESTS=1 -DDONT_CARE_OF_VIRTUALS=1 ../neo; \ - ninja -j 1 + df -h; mkdir /root/build; cd /root/build ; cmake -G Ninja \ + -DSUPPORT_GEN8=0 -DSUPPORT_GEN9=1 -DSUPPORT_GEN11=0 -DSUPPORT_GEN12LP=0 \ + -DBUILD_WITH_L0=FALSE -DDO_NOT_RUN_AUB_TESTS=1 -DDONT_CARE_OF_VIRTUALS=1 \ + -DUSE_ULT_PCH=1 ../neo; \ + ninja -j 2 && du -sh && cd .. && rm -rf build CMD ["/bin/bash"] diff --git a/scripts/docker/Dockerfile-fedora-32-copr b/scripts/docker/Dockerfile-fedora-34-copr similarity index 56% rename from scripts/docker/Dockerfile-fedora-32-copr rename to scripts/docker/Dockerfile-fedora-34-copr index e7ae015988..8fe7b0ece6 100644 --- a/scripts/docker/Dockerfile-fedora-32-copr +++ b/scripts/docker/Dockerfile-fedora-34-copr @@ -1,15 +1,17 @@ -FROM fedora:32 +FROM fedora:34 LABEL maintainer="jacek.danecki@intel.com" COPY neo /root/neo -RUN dnf install -y gcc-c++ cmake ninja-build git pkg-config; \ +RUN df -h; dnf install -y gcc-c++ cmake ninja-build git pkg-config; \ dnf install -y 'dnf-command(copr)'; \ dnf copr enable -y jdanecki/intel-opencl; \ dnf copr enable -y jdanecki/intel-opencl-ci; \ dnf --showduplicate list intel-igc-opencl-devel intel-gmmlib-devel; \ dnf install -y intel-igc-opencl-devel intel-gmmlib-devel; \ - mkdir /root/build; cd /root/build ; cmake -G Ninja \ - -DBUILD_WITH_L0=FALSE -DDO_NOT_RUN_AUB_TESTS=1 -DDONT_CARE_OF_VIRTUALS=1 ../neo; \ - ninja -j 1 + df -h; mkdir /root/build; cd /root/build ; cmake -G Ninja \ + -DSUPPORT_GEN8=1 -DSUPPORT_GEN9=0 -DSUPPORT_GEN11=1 -DSUPPORT_GEN12LP=1 \ + -DBUILD_WITH_L0=FALSE -DDO_NOT_RUN_AUB_TESTS=1 -DDONT_CARE_OF_VIRTUALS=1 \ + -DUSE_ULT_PCH=1 ../neo; \ + ninja -j 2 && du -sh && cd .. && rm -rf build CMD ["/bin/bash"] diff --git a/shared/test/unit_test/device_binary_format/patchtokens_decoder_tests.cpp b/shared/test/unit_test/device_binary_format/patchtokens_decoder_tests.cpp index 829c9ad541..6899e07b9c 100644 --- a/shared/test/unit_test/device_binary_format/patchtokens_decoder_tests.cpp +++ b/shared/test/unit_test/device_binary_format/patchtokens_decoder_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2020 Intel Corporation + * Copyright (C) 2019-2021 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -107,17 +107,17 @@ bool tokenOffsetMatched(const uint8_t *base, size_t tokenOffset, const iOpenCL:: } TEST(GetInlineData, GivenConstantMemorySurfaceTokenThenReturnProperOffsetToInlineData) { - iOpenCL::SPatchAllocateConstantMemorySurfaceProgramBinaryInfo surfTok[2]; + iOpenCL::SPatchAllocateConstantMemorySurfaceProgramBinaryInfo surfTok[2] = {}; EXPECT_EQ(reinterpret_cast(&surfTok[1]), NEO::PatchTokenBinary::getInlineData(&surfTok[0])); } TEST(GetInlineData, GivenGlobalMemorySurfaceTokenThenReturnProperOffsetToInlineData) { - iOpenCL::SPatchAllocateGlobalMemorySurfaceProgramBinaryInfo surfTok[2]; + iOpenCL::SPatchAllocateGlobalMemorySurfaceProgramBinaryInfo surfTok[2] = {}; EXPECT_EQ(reinterpret_cast(&surfTok[1]), NEO::PatchTokenBinary::getInlineData(&surfTok[0])); } TEST(GetInlineData, GivenStringTokenThenReturnProperOffsetToInlineData) { - iOpenCL::SPatchString surfTok[2]; + iOpenCL::SPatchString surfTok[2] = {}; EXPECT_EQ(reinterpret_cast(&surfTok[1]), NEO::PatchTokenBinary::getInlineData(&surfTok[0])); }