[CMake][runtimes] Skip the generic target variable if named matches

[phosek]

Summary

The existing logic relies on ordering, so if you use the following:

RUNTIMES_target+multi_VARIABLE_NAME
RUNTIMES_target_VARIABLE_NAME

The generic target variable would override the target+multi one. To
avoid that issue, we skip matching the generic target if the named
matches.

[phosek]

This is an alternative to D71570.

[JamesNagurne]

This foreach loop goes over each variable, yes?
If so, then I'm not sure this change does what is required.

If the list variableNames is:

RUNTIMES_target+multi_XYZ
RUNTIMES_target_XYZ

This loop will:

1. variableName = RUNTIMES_target+multi_XYZ
2. Check if {name} matches, it does
3. Add -DXYZ=value to the list
4. variableName = RUNTIMES_target_XYZ
5. Check if {name} matches, it doesn't
6. Else, check if {target} matches, it does
7. Add -DXYZ=value to the list, overriding the expected value in 3 above

Edit: That is to say, only one path will ever be executed per iteration of this loop, so the addition of else() doesn't change the behavior.

[phosek]

In D71737#1793355, @JamesNagurne wrote:

This foreach loop goes over each variable, yes?
If so, then I'm not sure this change does what is required.

If the list variableNames is:

RUNTIMES_target+multi_XYZ
RUNTIMES_target_XYZ

This loop will:

1. variableName = RUNTIMES_target+multi_XYZ
2. Check if {name} matches, it does
3. Add -DXYZ=value to the list
4. variableName = RUNTIMES_target_XYZ
5. Check if {name} matches, it doesn't
6. Else, check if {target} matches, it does
7. Add -DXYZ=value to the list, overriding the expected value in 3 above

Edit: That is to say, only one path will ever be executed per iteration of this loop, so the addition of else() doesn't change the behavior.

You're right, this doesn't address the issue. I was hoping to come up with a way to short circuit the iteration if a more specific variable was already added, but it's difficult to track that. Given that, your solution is probably the easiest one so let's go with that.

llvm/runtimes/CMakeLists.txt

function(runtime_register_target name target)
     endif()
 
     get_cmake_property(variableNames VARIABLES)
     foreach(variableName ${variableNames})
       string(FIND "${variableName}" "RUNTIMES_${name}_" out)
       if("${out}" EQUAL 0)
         string(REPLACE "RUNTIMES_${name}_" "" new_name ${variableName})
         list(APPEND ${name}_extra_args "-D${new_name}=${${variableName}}")
-      endif()
+      else()
       string(FIND "${variableName}" "RUNTIMES_${target}_" out)
       if("${out}" EQUAL 0)
         string(REPLACE "RUNTIMES_${target}_" "" new_name ${variableName})
         list(APPEND ${name}_extra_args "-D${new_name}=${${variableName}}")
       endif()
+      endif()
     endforeach()
 
     if(NOT RUNTIMES_${name}_LLVM_ENABLE_RUNTIMES)
       string(REPLACE ";" "|" LLVM_ENABLE_RUNTIMES_PASSTHROUGH "${LLVM_ENABLE_RUNTIMES}")
       list(APPEND ${name}_extra_args -DLLVM_ENABLE_RUNTIMES=${LLVM_ENABLE_RUNTIMES_PASSTHROUGH})
     endif()
 
     if(target IN_LIST LLVM_RUNTIME_BUILD_ID_LINK_TARGETS)