From 0ffdab2c1714fadd31075d903be269477e3a6656 Mon Sep 17 00:00:00 2001 From: Akira Moroo Date: Mon, 21 Oct 2019 22:17:34 +0900 Subject: [PATCH 1/2] lkl: add lld support for x86_64/i386 lld, the LLVM linker, can link recent mainline Linux kernel. It provides faster link time compared with GNU linker[1]. This commit adds lld support to lkl for x86_64/i386 Linux host with clang. To build with lld, invoke command like below: make -C tools/lkl CC=clang LD=ld.lld [1] https://lld.llvm.org/ Signed-off-by: Akira Moroo --- arch/lkl/auto.conf | 25 ++++++++++++++++++++++++- tools/lkl/Makefile.autoconf | 18 +++++++++++++++++- 2 files changed, 41 insertions(+), 2 deletions(-) diff --git a/arch/lkl/auto.conf b/arch/lkl/auto.conf index cf257066a5f745..114ed46e3d0e14 100644 --- a/arch/lkl/auto.conf +++ b/arch/lkl/auto.conf @@ -1,2 +1,25 @@ -export OUTPUT_FORMAT=$(shell $(LD) -r -print-output-format) +ifneq ($(shell $(LD) --version 2>&1 | head -n 1 | grep LLD),) + ifneq (,$(shell $(CC) --version 2>&1 | grep clang | head -n 1)) + TRIPLE=$(shell $(CC) --version 2>&1 | grep Target | cut -d " " -f2) + else + TRIPLE=$(shell $(CC) -dumpmachine) + endif + TRIPLE_ARCH=$(shell echo $(TRIPLE) | cut -d - -f1) + TRIPLE_VENDOR=$(shell echo $(TRIPLE) | cut -d - -f2) + TRIPLE_OS=$(shell echo $(TRIPLE) | cut -d - -f3) + ifneq (,$(filter linux,$(TRIPLE_VENDOR))) + TRIPLE_OS=$(TRIPLE_VENDOR) + endif + ifneq (,$(filter x86_64,$(TRIPLE_ARCH))) + ifneq (,$(filter linux,$(TRIPLE_OS))) + export OUTPUT_FORMAT=elf64-x86-64 + endif + else ifneq (,$(filter i386 i686,$(TRIPLE_ARCH))) + ifneq (,$(filter linux,$(TRIPLE_OS))) + export OUTPUT_FORMAT=elf32-i386 + endif + endif +else + export OUTPUT_FORMAT=$(shell $(LD) -r -print-output-format) +endif export EXEC_FORMAT=$(shell echo $(OUTPUT_FORMAT) | cut -d - -f1) diff --git a/tools/lkl/Makefile.autoconf b/tools/lkl/Makefile.autoconf index 38a2473c70623f..2d4384e97ec696 100644 --- a/tools/lkl/Makefile.autoconf +++ b/tools/lkl/Makefile.autoconf @@ -8,6 +8,22 @@ define set_autoconf_var export LKL_HOST_CONFIG_$(1)=$(2) endef +define set_output_format + $(eval output_format=$(shell $(LD) -r -print-output-format)) + $(if $(output_format),,$(if $(shell $(CC) --version 2>&1 | grep clang),$(eval \ + triple=$(shell $(CC) --version 2>&1 | grep Target | cut -d " " -f2)),$(eval \ + triple=$(shell $(CC) -dumpmachine)))) + $(eval arch=$(shell echo $(triple) | cut -d - -f1)) + $(eval vendor=$(shell echo $(triple) | cut -d - -f2)) + $(eval os=$(shell echo $(triple) | cut -d - -f3)) + $(if $(filter linux,$(vendor)),$(eval os=$(vendor))) + $(if $(filter x86_64,$(arch)),$(if $(filter linux,$(os)),$(eval \ + output_format=elf64-x86-64))) + $(if $(filter i386 i686,$(arch)),$(if $(filter linux,$(os)),$(eval \ + output_format=elf32-i386))) + $(1) := $$(output_format) +endef + define find_include $(eval include_paths=$(shell $(CC) -E -Wp,-v -xc /dev/null 2>&1 | grep '^ ')) $(foreach f, $(include_paths), $(wildcard $(f)/$(1))) @@ -98,7 +114,7 @@ define do_autoconf export AR := $(CROSS_COMPILE)ar $(eval LD := $(CROSS_COMPILE)ld) $(eval CC := $(CROSS_COMPILE)gcc) - $(eval LD_FMT := $(shell $(LD) -r -print-output-format)) + $(eval $(call set_output_format,LD_FMT)) $(eval EXEC_FMT := $(shell echo $(LD_FMT) | cut -d "-" -f1)) $(if $(filter $(EXEC_FMT),$(POSIX_HOSTS)),$(call posix_host,$(LD_FMT))) $(if $(filter $(EXEC_FMT),$(NT_HOSTS)),$(call nt_host,$(LD_FMT))) From a95bcb46794cbc05627a73320116781bfe7afc78 Mon Sep 17 00:00:00 2001 From: Akira Moroo Date: Sat, 26 Oct 2019 17:36:32 +0900 Subject: [PATCH 2/2] lkl: add CircleCI jobs for clang/lld This commit adds CircleCI jobs for building with clang/lld toolchain. The targets are x86_64 and i386 so far. The jobs uses new docker images, lkldocker/circleci-clang-x86_64 and lkldocker/circleci-clang-i386[1]. [1] https://github.com/lkl/lkl-docker/pull/5 Signed-off-by: Akira Moroo --- .circleci/config.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5858d0ccbcec18..05465fc9445521 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -106,6 +106,22 @@ jobs: CROSS_COMPILE: "" <<: *do_steps + clang-lld-x86_64: + docker: + - image: lkldocker/circleci-clang-x86_64:0.1 + environment: + CROSS_COMPILE: "" + MKARG: "CC=clang LD=ld.lld dpdk=no" + <<: *do_steps + + clang-lld-i386: + docker: + - image: lkldocker/circleci-clang-i386:0.1 + environment: + CROSS_COMPILE: "" + MKARG: "CC=clang LD=ld.lld" + <<: *do_steps + mingw32: docker: - image: lkldocker/circleci-mingw:0.6 @@ -173,6 +189,8 @@ workflows: - freebsd11_x86_64 - checkpatch - i386 + - clang-lld-x86_64 + - clang-lld-i386 nightly: triggers: - schedule: