From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id BA7174619F; Wed, 5 Feb 2025 17:18:57 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8F4B940289; Wed, 5 Feb 2025 17:18:57 +0100 (CET) Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.19]) by mails.dpdk.org (Postfix) with ESMTP id 4879240270 for ; Wed, 5 Feb 2025 17:18:56 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1738772337; x=1770308337; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=p3E9purjKKKWPZ2M2smqgWHN/UhLOLaFH/pMnpcj1eM=; b=mhP5J4Sr3IQSVFtrCdeJ2YisPQHhxlzd9t5fWkqdBN7/eFRomuhJhf4x KG2Uai1KmYFi+8uOjTNPR+BH39iDxgMNjeRfiT5IX+vyPeakBd5GP9mE9 9Bhj+3ORhWkcZjIzjSgDv922xGugzwlDuK82x9lhbxzcrtx1bJbND1MdT 2js5FdEgPnebup0NMJDwBNFge40AHDatMMWfdLscf3KdxYyqYqUM/HMBf byuCGw6ThtfPSj0WbOafvBIWYuJ9fGodkxafJYI0XZhS4WwjW4SfB5AJj akc3Nvdv2rdvKfwzaMDEqMaYnYpPlEe1F6WobzxxzgsA3sVRjGUgK2g/W Q==; X-CSE-ConnectionGUID: xzMJv1LNRbS02KCz19P95w== X-CSE-MsgGUID: 2VzCzl8UQNapnwcTSwX1tA== X-IronPort-AV: E=McAfee;i="6700,10204,11336"; a="38550426" X-IronPort-AV: E=Sophos;i="6.13,262,1732608000"; d="scan'208";a="38550426" Received: from fmviesa007.fm.intel.com ([10.60.135.147]) by fmvoesa113.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Feb 2025 08:18:56 -0800 X-CSE-ConnectionGUID: fAYvyvt6Tlq2Aooak+0E0g== X-CSE-MsgGUID: Uz02eLuITZmff86UHFRSUw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.13,262,1732608000"; d="scan'208";a="110843848" Received: from silpixa00401197coob.ir.intel.com (HELO silpixa00401385.ir.intel.com) ([10.237.214.45]) by fmviesa007.fm.intel.com with ESMTP; 05 Feb 2025 08:18:53 -0800 From: Bruce Richardson To: dev@dpdk.org Cc: anatoly.burakov@intel.com, vladimir.medvedkin@intel.com, ian.stokes@intel.com, john.mcnamara@intel.com, Bruce Richardson Subject: [PATCH] build: remove support for icc compiler Date: Wed, 5 Feb 2025 16:18:19 +0000 Message-ID: <20250205161823.2849595-1-bruce.richardson@intel.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org The Intel-produced compiler "icc" has been replaced by the newer clang-based "icx" compiler. DPDK compilation has also not been tested recently with the icc compiler, so let's remove doc and code references to icc, and any special macros or build support that was added for it. Signed-off-by: Bruce Richardson --- app/test/test_pie.c | 5 ----- app/test/test_red.c | 5 ----- .../contributing/img/patch_cheatsheet.svg | 2 +- doc/guides/linux_gsg/sys_reqs.rst | 3 --- doc/guides/nics/enic.rst | 2 +- doc/guides/nics/hinic.rst | 1 - doc/guides/nics/hns3.rst | 1 - doc/guides/nics/ngbe.rst | 1 - doc/guides/nics/txgbe.rst | 1 - doc/guides/prog_guide/lto.rst | 2 +- .../prog_guide/writing_efficient_code.rst | 2 +- doc/guides/rel_notes/known_issues.rst | 19 ------------------- drivers/net/mlx5/mlx5_rxtx_vec_altivec.h | 2 +- drivers/net/virtio/meson.build | 2 -- drivers/net/virtio/virtio_rxtx_packed.h | 5 ----- dts/framework/config/__init__.py | 2 -- dts/framework/testbed_model/posix_session.py | 2 -- lib/eal/include/rte_common.h | 6 ++---- lib/eal/x86/include/rte_rtm.h | 2 +- lib/eal/x86/include/rte_vect.h | 13 ------------- lib/sched/rte_pie.c | 4 ---- lib/sched/rte_red.c | 4 ---- lib/sched/rte_sched.c | 5 ----- lib/vhost/meson.build | 2 -- lib/vhost/vhost.h | 5 ----- 25 files changed, 8 insertions(+), 90 deletions(-) diff --git a/app/test/test_pie.c b/app/test/test_pie.c index 8036bac1e6..72ef3869d0 100644 --- a/app/test/test_pie.c +++ b/app/test/test_pie.c @@ -41,11 +41,6 @@ test_pie_all(void) #include -#ifdef __INTEL_COMPILER -#pragma warning(disable:2259) /* conversion may lose significant bits */ -#pragma warning(disable:181) /* Arg incompatible with format string */ -#endif - /**< structures for testing rte_pie performance and function */ struct test_rte_pie_config { /**< Test structure for RTE_PIE config */ struct rte_pie_config *pconfig; /**< RTE_PIE configuration parameters */ diff --git a/app/test/test_red.c b/app/test/test_red.c index 6bf58ad4dd..7f38ed1469 100644 --- a/app/test/test_red.c +++ b/app/test/test_red.c @@ -40,11 +40,6 @@ test_red_all(void) #include -#ifdef __INTEL_COMPILER -#pragma warning(disable:2259) /* conversion may lose significant bits */ -#pragma warning(disable:181) /* Arg incompatible with format string */ -#endif - #define TEST_HZ_PER_KHZ 1000 #define TEST_NSEC_MARGIN 500 /**< nanosecond margin when calculating clk freq */ diff --git a/doc/guides/contributing/img/patch_cheatsheet.svg b/doc/guides/contributing/img/patch_cheatsheet.svg index 986e4db815..4debb07b98 100644 --- a/doc/guides/contributing/img/patch_cheatsheet.svg +++ b/doc/guides/contributing/img/patch_cheatsheet.svg @@ -718,7 +718,7 @@ style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:21px;line-height:125%;font-family:monospace;-inkscape-font-specification:'Monospace Bold';text-align:start;writing-mode:lr-tb;text-anchor:start" id="tspan4092-8-7" y="454.36987" - x="49.093246">+ build gcc icc clang + x="49.093246">+ build gcc clang =3.7.0')) cflags += '-DVIRTIO_CLANG_UNROLL_PRAGMA' - elif (toolchain == 'icc' and cc.version().version_compare('>=16.0.0')) - cflags += '-DVIRTIO_ICC_UNROLL_PRAGMA' endif endif sources += files('virtio_rxtx_simple_sse.c') diff --git a/drivers/net/virtio/virtio_rxtx_packed.h b/drivers/net/virtio/virtio_rxtx_packed.h index 536112983c..12bfcee809 100644 --- a/drivers/net/virtio/virtio_rxtx_packed.h +++ b/drivers/net/virtio/virtio_rxtx_packed.h @@ -77,11 +77,6 @@ for (iter = val; iter < size; iter++) #endif -#ifdef VIRTIO_ICC_UNROLL_PRAGMA -#define virtio_for_each_try_unroll(iter, val, size) _Pragma("unroll 4") \ - for (iter = val; iter < size; iter++) -#endif - #ifndef virtio_for_each_try_unroll #define virtio_for_each_try_unroll(iter, val, size) \ for (iter = val; iter < size; iter++) diff --git a/dts/framework/config/__init__.py b/dts/framework/config/__init__.py index 6bf4885815..781c1ab831 100644 --- a/dts/framework/config/__init__.py +++ b/dts/framework/config/__init__.py @@ -116,8 +116,6 @@ class Compiler(StrEnum): #: clang = auto() #: - icc = auto() - #: msvc = auto() diff --git a/dts/framework/testbed_model/posix_session.py b/dts/framework/testbed_model/posix_session.py index c0cca2ac50..101513b45e 100644 --- a/dts/framework/testbed_model/posix_session.py +++ b/dts/framework/testbed_model/posix_session.py @@ -381,8 +381,6 @@ def get_compiler_version(self, compiler_name: str) -> str: ).stdout.split("\n")[0] case "msvc": return self.send_command("cl", SETTINGS.timeout).stdout - case "icc": - return self.send_command(f"{compiler_name} -V", SETTINGS.timeout).stdout case _: raise ValueError(f"Unknown compiler {compiler_name}") diff --git a/lib/eal/include/rte_common.h b/lib/eal/include/rte_common.h index 7a252c1997..3f77b7624e 100644 --- a/lib/eal/include/rte_common.h +++ b/lib/eal/include/rte_common.h @@ -59,8 +59,6 @@ extern "C" { #define RTE_CC_IS_GNU 0 #if defined __clang__ #define RTE_CC_CLANG -#elif defined __INTEL_COMPILER -#define RTE_CC_ICC #elif defined __GNUC__ #define RTE_CC_GCC #undef RTE_CC_IS_GNU @@ -160,7 +158,7 @@ typedef uint16_t unaligned_uint16_t; * Macros to cause the compiler to remember the state of the diagnostics as of * each push, and restore to that point at each pop. */ -#if !defined(__INTEL_COMPILER) && !defined(RTE_TOOLCHAIN_MSVC) +#if !defined(RTE_TOOLCHAIN_MSVC) #define __rte_diagnostic_push _Pragma("GCC diagnostic push") #define __rte_diagnostic_pop _Pragma("GCC diagnostic pop") #else @@ -172,7 +170,7 @@ typedef uint16_t unaligned_uint16_t; * Macro to disable compiler warnings about removing a type * qualifier from the target type. */ -#if !defined(__INTEL_COMPILER) && !defined(RTE_TOOLCHAIN_MSVC) +#if !defined(RTE_TOOLCHAIN_MSVC) #define __rte_diagnostic_ignored_wcast_qual _Pragma("GCC diagnostic ignored \"-Wcast-qual\"") #else #define __rte_diagnostic_ignored_wcast_qual diff --git a/lib/eal/x86/include/rte_rtm.h b/lib/eal/x86/include/rte_rtm.h index b84e58e059..6689d036c8 100644 --- a/lib/eal/x86/include/rte_rtm.h +++ b/lib/eal/x86/include/rte_rtm.h @@ -7,7 +7,7 @@ #include -/* Official RTM intrinsics interface matching gcc/icc, but works +/* Official RTM intrinsics interface matching gcc, but works on older gcc compatible compilers and binutils. */ #include diff --git a/lib/eal/x86/include/rte_vect.h b/lib/eal/x86/include/rte_vect.h index 5fdcd632ac..04b54ee52b 100644 --- a/lib/eal/x86/include/rte_vect.h +++ b/lib/eal/x86/include/rte_vect.h @@ -74,19 +74,6 @@ __extension__ ({ \ }) #endif -/* - * Prior to version 12.1 icc doesn't support _mm_set_epi64x. - */ -#if (defined(__ICC) && __ICC < 1210) -#define _mm_set_epi64x(a, b) \ -__extension__ ({ \ - rte_xmm_t m; \ - m.u64[0] = b; \ - m.u64[1] = a; \ - (m.x); \ -}) -#endif /* (defined(__ICC) && __ICC < 1210) */ - #ifdef __AVX512F__ #define RTE_X86_ZMM_SIZE (sizeof(__m512i)) diff --git a/lib/sched/rte_pie.c b/lib/sched/rte_pie.c index 2eb0b0f74e..a9f650e60f 100644 --- a/lib/sched/rte_pie.c +++ b/lib/sched/rte_pie.c @@ -9,10 +9,6 @@ #include "rte_sched_log.h" #include "rte_pie.h" -#ifdef __INTEL_COMPILER -#pragma warning(disable:2259) /* conversion may lose significant bits */ -#endif - int rte_pie_rt_data_init(struct rte_pie *pie) { diff --git a/lib/sched/rte_red.c b/lib/sched/rte_red.c index 45a452f68e..fa27a141ed 100644 --- a/lib/sched/rte_red.c +++ b/lib/sched/rte_red.c @@ -7,10 +7,6 @@ #include #include -#ifdef __INTEL_COMPILER -#pragma warning(disable:2259) /* conversion may lose significant bits */ -#endif - static int rte_red_init_done = 0; /**< Flag to indicate that global initialisation is done */ uint32_t rte_red_rand_val = 0; /**< Random value cache */ uint32_t rte_red_rand_seed = 0; /**< Seed for random number generation */ diff --git a/lib/sched/rte_sched.c b/lib/sched/rte_sched.c index bbdb5d1d86..d8ee4e7e91 100644 --- a/lib/sched/rte_sched.c +++ b/lib/sched/rte_sched.c @@ -22,11 +22,6 @@ #include "rte_approx.h" - -#ifdef __INTEL_COMPILER -#pragma warning(disable:2259) /* conversion may lose significant bits */ -#endif - #ifndef RTE_SCHED_PORT_N_GRINDERS #define RTE_SCHED_PORT_N_GRINDERS 8 #endif diff --git a/lib/vhost/meson.build b/lib/vhost/meson.build index 51bcf17244..2eec51b2e7 100644 --- a/lib/vhost/meson.build +++ b/lib/vhost/meson.build @@ -12,8 +12,6 @@ if (toolchain == 'gcc' and cc.version().version_compare('>=8.3.0')) cflags += '-DVHOST_GCC_UNROLL_PRAGMA' elif (toolchain == 'clang' and cc.version().version_compare('>=3.7.0')) cflags += '-DVHOST_CLANG_UNROLL_PRAGMA' -elif (toolchain == 'icc' and cc.version().version_compare('>=16.0.0')) - cflags += '-DVHOST_ICC_UNROLL_PRAGMA' endif dpdk_conf.set('RTE_LIBRTE_VHOST_POSTCOPY', cc.has_header('linux/userfaultfd.h')) cflags += [ diff --git a/lib/vhost/vhost.h b/lib/vhost/vhost.h index 1f4192f5d1..63d2aa9502 100644 --- a/lib/vhost/vhost.h +++ b/lib/vhost/vhost.h @@ -79,11 +79,6 @@ for (iter = val; iter < size; iter++) #endif -#ifdef VHOST_ICC_UNROLL_PRAGMA -#define vhost_for_each_try_unroll(iter, val, size) _Pragma("unroll (4)") \ - for (iter = val; iter < size; iter++) -#endif - #ifndef vhost_for_each_try_unroll #define vhost_for_each_try_unroll(iter, val, num) \ for (iter = val; iter < num; iter++) -- 2.43.0