Rename llvm/utils/TableGen/X86ManualFoldTables.def to .inc

[chapuni]

Summary

Unfortunately, Bazel doesn't accept .def as header fragments in cc_binary.
(Corresponding to CMake's add_executable)
In addition, .def is sometimes used to Win32's module definitions.

Could you avoid using .def here?

Note, Bazel's cc_library may accept header files with any suffix.

[chapuni]

See also rGff1b820c7d0cd46f024c0d93a0994e6f5996cc16

[skan]

Hi @chapuni, why does the .def file here bother you? I can see many .def files in textual_hdrs of utils/bazel/llvm-project-overlay/llvm/BUILD.bazel.

[GMNGeoffrey]

Since Bazel is not a generally-supported build system, we shouldn't be making changes to the source solely for the benefit of the Bazel build system. I do find it a bit weird that LLVM uses the ".def" extension for these files, given that it's the extension for MSVC module definition files, but the usage appears to be widespread in the project, so I don't think it makes sense to just change this one file unless there's something that distinguishes it from the others outside of how Bazel feels about it.

[chapuni]

@GMNGeoffrey This was the first change to add .def to the executable, aka cc_binary, AFAIK.
I wanted to stop it since it was the first issue that was added recently.

I know we shouldn't work something for the convenience of bazel.
As you can guess, "Win32's module def" was just my 2nd excuse.

I think since rGff1b820c7d0cd46f024c0d93a0994e6f5996cc16 is sufficient, I would make adding header libraries in the future for similar issues.

llvm/utils/TableGen/X86FoldTablesEmitter.cpp

 //===- utils/TableGen/X86FoldTablesEmitter.cpp - X86 backend-*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 //

 
 // List of instructions NOT requiring explicit memory alignment.
 const char *ExplicitUnalign[] = {"MOVDQU", "MOVUPS", "MOVUPD",
                                  "PCMPESTRM", "PCMPESTRI",
                                  "PCMPISTRM", "PCMPISTRI" };
 
 const ManualMapEntry ManualMapSet[] = {
 #define ENTRY(REG, MEM, FLAGS) {#REG, #MEM, FLAGS},
-#include "X86ManualFoldTables.def"
+#include "X86ManualFoldTables.inc"
 };
 
 const std::set<StringRef> NoFoldSet= {
 #define NOFOLD(INSN) #INSN,
-#include "X86ManualFoldTables.def"
+#include "X86ManualFoldTables.inc"
 };
 
 static bool isExplicitAlign(const CodeGenInstruction *Inst) {
   return any_of(ExplicitAlign, [Inst](const char *InstStr) {
     return Inst->TheDef->getName().contains(InstStr);
   });
 }
 

llvm/utils/TableGen/X86ManualFoldTables.inc

-//===- X86ManualFoldTables.def ----------------------------*- C++ -*-==//
+//===- X86ManualFoldTables.inc -----------------------------------*- C++ -*-==//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 // \file
 // This file defines all the entries in X86 memory folding tables that need

utils/bazel/llvm-project-overlay/llvm/BUILD.bazel

cc_library(
     strip_include_prefix = "utils/TableGen",
     deps = [
         ":Support",
         ":TableGen",
         ":config",
     ],
 )
 
-cc_library(
-    name = "llvm-tblgen-headers",
-    textual_hdrs = glob(["utils/TableGen/*.def"]),
-)
-
 cc_binary(
     name = "llvm-tblgen",
     srcs = glob([
         "utils/TableGen/*.cpp",
         "utils/TableGen/*.inc",
         "utils/TableGen/*.h",
 
         # Some tablegen sources include headers from MC, so these have to be
         # listed here. MC uses headers produced by tablegen, so it cannot be a
         # regular dependency.
         "include/llvm/MC/*.h",
     ]),
     copts = llvm_copts,
     stamp = 0,
     deps = [
         ":LLVMTableGenGlobalISel",
         ":Support",
         ":TableGen",
         ":config",
-        ":llvm-tblgen-headers",
     ],
 )
 
 gentbl(
     name = "intrinsic_enums_gen",
     tbl_outs = [("-gen-intrinsic-enums", "include/llvm/IR/IntrinsicEnums.inc")],
     tblgen = ":llvm-tblgen",
     td_file = "include/llvm/IR/Intrinsics.td",