[llvm-branch-commits] [libclc] libclc: Move subnormal config file to clc (PR #187354)

[Matt Arsenault via llvm-branch-commits]

https://github.com/arsenm created https://github.com/llvm/llvm-project/pull/187354

Fix layering violation.

>From bfaf9e5860af457e89bfae99adf2160fc3a3db5b Mon Sep 17 00:00:00 2001
From: Matt Arsenault <Matthew.Arsenault at amd.com>
Date: Wed, 18 Mar 2026 18:28:53 +0100
Subject: [PATCH] libclc: Move subnormal config file to clc

Fix layering violation.
---
 libclc/clc/lib/generic/CMakeLists.txt                  | 1 +
 libclc/{opencl => clc}/lib/generic/subnormal_config.cl | 1 -
 libclc/opencl/lib/clspv/CMakeLists.txt                 | 1 -
 libclc/opencl/lib/generic/CMakeLists.txt               | 1 -
 4 files changed, 1 insertion(+), 3 deletions(-)
 rename libclc/{opencl => clc}/lib/generic/subnormal_config.cl (95%)

diff --git a/libclc/clc/lib/generic/CMakeLists.txt b/libclc/clc/lib/generic/CMakeLists.txt
index bda2ec67a55c3..f9eb15a0aafda 100644
--- a/libclc/clc/lib/generic/CMakeLists.txt
+++ b/libclc/clc/lib/generic/CMakeLists.txt
@@ -193,6 +193,7 @@ libclc_configure_source_list(CLC_GENERIC_SOURCES
   shared/clc_qualifier.cl
   shared/clc_vload.cl
   shared/clc_vstore.cl
+  subnormal_config.cl
   subgroup/sub_group_barrier.cl
   workitem/clc_get_global_id.cl
   workitem/clc_get_global_linear_id.cl
diff --git a/libclc/opencl/lib/generic/subnormal_config.cl b/libclc/clc/lib/generic/subnormal_config.cl
similarity index 95%
rename from libclc/opencl/lib/generic/subnormal_config.cl
rename to libclc/clc/lib/generic/subnormal_config.cl
index be40607c69a3d..f3a9ae8deebe9 100644
--- a/libclc/opencl/lib/generic/subnormal_config.cl
+++ b/libclc/clc/lib/generic/subnormal_config.cl
@@ -7,7 +7,6 @@
 //===----------------------------------------------------------------------===//
 
 #include "clc/math/clc_subnormal_config.h"
-#include "clc/opencl/opencl-base.h"
 
 _CLC_DEF bool __clc_fp16_subnormals_supported() { return false; }
 
diff --git a/libclc/opencl/lib/clspv/CMakeLists.txt b/libclc/opencl/lib/clspv/CMakeLists.txt
index 3094433e16272..2b9aa33f6e178 100644
--- a/libclc/opencl/lib/clspv/CMakeLists.txt
+++ b/libclc/opencl/lib/clspv/CMakeLists.txt
@@ -83,7 +83,6 @@ libclc_configure_source_list(_gen_sources
   math/tanh.cl
   math/tanpi.cl
   math/tgamma.cl
-  subnormal_config.cl
 )
 
 set(OPENCL_CLSPV_SOURCES ${_clspv_sources} ${_gen_sources} PARENT_SCOPE)
diff --git a/libclc/opencl/lib/generic/CMakeLists.txt b/libclc/opencl/lib/generic/CMakeLists.txt
index ca95e6d5cfe23..f30af80e9c65e 100644
--- a/libclc/opencl/lib/generic/CMakeLists.txt
+++ b/libclc/opencl/lib/generic/CMakeLists.txt
@@ -208,7 +208,6 @@ libclc_configure_source_list(OPENCL_GENERIC_SOURCES
   subgroup/sub_group_broadcast.cl
   subgroup/sub_group_reduce.cl
   subgroup/subgroup.cl
-  subnormal_config.cl
   synchronization/sub_group_barrier.cl
   synchronization/work_group_barrier.cl
   workitem/get_enqueued_local_size.cl