Avoid auto, as requested

Author: jdenny-ornl

llvm/lib/Target/AMDGPU/AMDGPUTargetTransformInfo.cpp

@@ -1414,14 +1414,15 @@ bool GCNTTIImpl::shouldPrefetchAddressSpace(unsigned AS) const {
 void GCNTTIImpl::collectKernelLaunchBounds(
     const Function &F,
     SmallVectorImpl<std::pair<StringRef, int64_t>> &LB) const {
-  auto MaxNumWorkgroups = ST->getMaxNumWorkGroups(F);
+  SmallVector<unsigned> MaxNumWorkgroups = ST->getMaxNumWorkGroups(F);
   LB.push_back({"amdgpu-max-num-workgroups[0]", MaxNumWorkgroups[0]});
   LB.push_back({"amdgpu-max-num-workgroups[1]", MaxNumWorkgroups[1]});
   LB.push_back({"amdgpu-max-num-workgroups[2]", MaxNumWorkgroups[2]});
-  auto FlatWorkGroupSize = ST->getFlatWorkGroupSizes(F);
+  std::pair<unsigned, unsigned> FlatWorkGroupSize =
+      ST->getFlatWorkGroupSizes(F);
   LB.push_back({"amdgpu-flat-work-group-size[0]", FlatWorkGroupSize.first});
   LB.push_back({"amdgpu-flat-work-group-size[1]", FlatWorkGroupSize.second});
-  auto WavesPerEU = ST->getWavesPerEU(F);
+  std::pair<unsigned, unsigned> WavesPerEU = ST->getWavesPerEU(F);
   LB.push_back({"amdgpu-waves-per-eu[0]", WavesPerEU.first});
   LB.push_back({"amdgpu-waves-per-eu[1]", WavesPerEU.second});
 }

llvm/lib/Target/NVPTX/NVPTXTargetTransformInfo.cpp

@@ -447,12 +447,13 @@ void NVPTXTTIImpl::getPeelingPreferences(Loop *L, ScalarEvolution &SE,
 void NVPTXTTIImpl::collectKernelLaunchBounds(
     const Function &F,
     SmallVectorImpl<std::pair<StringRef, int64_t>> &LB) const {
-  if (auto Val = getMaxClusterRank(F))
+  std::optional<unsigned> Val;
+  if ((Val = getMaxClusterRank(F)))
     LB.push_back({"maxclusterrank", *Val});
-  if (auto Val = getMaxNTIDx(F))
+  if ((Val = getMaxNTIDx(F)))
     LB.push_back({"maxntidx", *Val});
-  if (auto Val = getMaxNTIDy(F))
+  if ((Val = getMaxNTIDy(F)))
     LB.push_back({"maxntidy", *Val});
-  if (auto Val = getMaxNTIDz(F))
+  if ((Val = getMaxNTIDz(F)))
     LB.push_back({"maxntidz", *Val});
 }