scripts: Remove ICC-related dead code

[PATCH] scripts: Remove ICC-related dead code

Posted by Ruihan Li 2 years, 7 months ago

Intel compiler support has already been completely removed in commit
95207db8166a ("Remove Intel compiler support"). However, it appears that
there is still some ICC-related code in scripts/cc-version.sh. There is
no harm in leaving the code as it is, but removing the dead code makes
the codebase a bit cleaner.

Hopefully all ICC-related stuff in the build scripts will be removed
after this commit, given the grep output as below:

	(linux/scripts) $ grep -i -w -R 'icc'
	cc-version.sh:ICC)
	cc-version.sh:	min_version=$($min_tool_version icc)
	dtc/include-prefixes/arm64/qcom/sm6350.dtsi:#include <dt-bindings/interconnect/qcom,icc.h>

Fixes: 95207db8166a ("Remove Intel compiler support")
Signed-off-by: Ruihan Li <lrh2000@pku.edu.cn>
---
 scripts/cc-version.sh | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/scripts/cc-version.sh b/scripts/cc-version.sh
index 0573c92e8..a7e28b6a5 100755
--- a/scripts/cc-version.sh
+++ b/scripts/cc-version.sh
@@ -45,10 +45,6 @@ Clang)
 	version=$2.$3.$4
 	min_version=$($min_tool_version llvm)
 	;;
-ICC)
-	version=$(($2 / 100)).$(($2 % 100)).$3
-	min_version=$($min_tool_version icc)
-	;;
 *)
 	echo "$orig_args: unknown C compiler" >&2
 	exit 1
-- 
2.40.0

Re: [PATCH] scripts: Remove ICC-related dead code

Posted by Miguel Ojeda 2 years, 7 months ago

On Mon, Apr 24, 2023 at 6:22 PM Ruihan Li <lrh2000@pku.edu.cn> wrote:
>
> Intel compiler support has already been completely removed in commit
> 95207db8166a ("Remove Intel compiler support"). However, it appears that
> there is still some ICC-related code in scripts/cc-version.sh. There is
> no harm in leaving the code as it is, but removing the dead code makes
> the codebase a bit cleaner.

Reviewed-by: Miguel Ojeda <ojeda@kernel.org>

Cheers,
Miguel

Re: [PATCH] scripts: Remove ICC-related dead code

Posted by Linus Torvalds 2 years, 7 months ago

On Mon, Apr 24, 2023 at 10:27 AM Miguel Ojeda
<miguel.ojeda.sandonis@gmail.com> wrote:
>
> Reviewed-by: Miguel Ojeda <ojeda@kernel.org>

I took that patch before this email came in, so that reviewed-by will
be missing in the tree, I'm afraid.

                     Linus

Re: [PATCH] scripts: Remove ICC-related dead code

Posted by Nathan Chancellor 2 years, 7 months ago

On Tue, Apr 25, 2023 at 12:21:10AM +0800, Ruihan Li wrote:
> Intel compiler support has already been completely removed in commit
> 95207db8166a ("Remove Intel compiler support"). However, it appears that
> there is still some ICC-related code in scripts/cc-version.sh. There is
> no harm in leaving the code as it is, but removing the dead code makes
> the codebase a bit cleaner.
> 
> Hopefully all ICC-related stuff in the build scripts will be removed
> after this commit, given the grep output as below:
> 
> 	(linux/scripts) $ grep -i -w -R 'icc'
> 	cc-version.sh:ICC)
> 	cc-version.sh:	min_version=$($min_tool_version icc)
> 	dtc/include-prefixes/arm64/qcom/sm6350.dtsi:#include <dt-bindings/interconnect/qcom,icc.h>
> 
> Fixes: 95207db8166a ("Remove Intel compiler support")
> Signed-off-by: Ruihan Li <lrh2000@pku.edu.cn>

Thanks for the patch. I am not sure this patch really needs a fixes tag,
as I do not really think dead code is a bug (and the commit message even
mentions this), but who cares I guess? :) cleanups are always nice.

Reviewed-by: Nathan Chancellor <nathan@kernel.org>

> ---
>  scripts/cc-version.sh | 4 ----
>  1 file changed, 4 deletions(-)
> 
> diff --git a/scripts/cc-version.sh b/scripts/cc-version.sh
> index 0573c92e8..a7e28b6a5 100755
> --- a/scripts/cc-version.sh
> +++ b/scripts/cc-version.sh
> @@ -45,10 +45,6 @@ Clang)
>  	version=$2.$3.$4
>  	min_version=$($min_tool_version llvm)
>  	;;
> -ICC)
> -	version=$(($2 / 100)).$(($2 % 100)).$3
> -	min_version=$($min_tool_version icc)
> -	;;
>  *)
>  	echo "$orig_args: unknown C compiler" >&2
>  	exit 1
> -- 
> 2.40.0
>

Re: [PATCH] scripts: Remove ICC-related dead code

Posted by Nick Desaulniers 2 years, 7 months ago

On Mon, Apr 24, 2023 at 9:21 AM Ruihan Li <lrh2000@pku.edu.cn> wrote:
>
> Intel compiler support has already been completely removed in commit
> 95207db8166a ("Remove Intel compiler support"). However, it appears that
> there is still some ICC-related code in scripts/cc-version.sh. There is
> no harm in leaving the code as it is, but removing the dead code makes
> the codebase a bit cleaner.
>
> Hopefully all ICC-related stuff in the build scripts will be removed
> after this commit, given the grep output as below:
>
>         (linux/scripts) $ grep -i -w -R 'icc'
>         cc-version.sh:ICC)
>         cc-version.sh:  min_version=$($min_tool_version icc)
>         dtc/include-prefixes/arm64/qcom/sm6350.dtsi:#include <dt-bindings/interconnect/qcom,icc.h>
>
> Fixes: 95207db8166a ("Remove Intel compiler support")
> Signed-off-by: Ruihan Li <lrh2000@pku.edu.cn>

Thanks for the patch!
Reviewed-by: Nick Desaulniers <ndesaulniers@google.com>

> ---
>  scripts/cc-version.sh | 4 ----
>  1 file changed, 4 deletions(-)
>
> diff --git a/scripts/cc-version.sh b/scripts/cc-version.sh
> index 0573c92e8..a7e28b6a5 100755
> --- a/scripts/cc-version.sh
> +++ b/scripts/cc-version.sh
> @@ -45,10 +45,6 @@ Clang)
>         version=$2.$3.$4
>         min_version=$($min_tool_version llvm)
>         ;;
> -ICC)
> -       version=$(($2 / 100)).$(($2 % 100)).$3
> -       min_version=$($min_tool_version icc)
> -       ;;
>  *)
>         echo "$orig_args: unknown C compiler" >&2
>         exit 1
> --
> 2.40.0
>


-- 
Thanks,
~Nick Desaulniers