[llvm] [RISCV] Add mvendorid/marchid/mimpid to CPU definitions (PR #116202)

Fri Nov 22 04:04:15 PST 2024

llvm-ci wrote:

LLVM Buildbot has detected a new failure on builder `mlir-nvidia-gcc7` running on `mlir-nvidia` while building `llvm` at step 5 "build-check-mlir-build-only".

Full details are available at: https://lab.llvm.org/buildbot/#/builders/116/builds/6728

<details>
<summary>Here is the relevant piece of the build log for the reference</summary>

```
Step 5 (build-check-mlir-build-only) failure: build (failure)
...
17.335 [1606/16/2978] Building CXX object lib/WindowsDriver/CMakeFiles/LLVMWindowsDriver.dir/MSVCPaths.cpp.o
17.358 [1606/15/2979] Building CXX object tools/mlir/tools/mlir-linalg-ods-gen/CMakeFiles/mlir-linalg-ods-yaml-gen.dir/mlir-linalg-ods-yaml-gen.cpp.o
17.367 [1606/14/2980] Building CXX object lib/TargetParser/CMakeFiles/LLVMTargetParser.dir/RISCVISAInfo.cpp.o
/vol/worker/mlir-nvidia/mlir-nvidia-gcc7/llvm.src/llvm/lib/TargetParser/RISCVISAInfo.cpp: In member function ‘std::vector<std::__cxx11::basic_string<char> > llvm::RISCVISAInfo::toFeatures(bool, bool) const’:
/vol/worker/mlir-nvidia/mlir-nvidia-gcc7/llvm.src/llvm/lib/TargetParser/RISCVISAInfo.cpp:290:31: warning: unused variable ‘_’ [-Wunused-variable]
   for (const auto &[ExtName, _] : Exts) {
                               ^
17.471 [1606/13/2981] Building X86GenFastISel.inc...
18.203 [1606/12/2982] Building X86GenGlobalISel.inc...
18.319 [1606/11/2983] Building CXX object lib/IR/CMakeFiles/LLVMCore.dir/Type.cpp.o
FAILED: lib/IR/CMakeFiles/LLVMCore.dir/Type.cpp.o 
CCACHE_CPP2=yes CCACHE_HASHDIR=yes /usr/bin/ccache /usr/bin/g++-7 -DGTEST_HAS_RTTI=0 -D_DEBUG -D_GLIBCXX_ASSERTIONS -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -I/vol/worker/mlir-nvidia/mlir-nvidia-gcc7/llvm.obj/lib/IR -I/vol/worker/mlir-nvidia/mlir-nvidia-gcc7/llvm.src/llvm/lib/IR -I/vol/worker/mlir-nvidia/mlir-nvidia-gcc7/llvm.obj/include -I/vol/worker/mlir-nvidia/mlir-nvidia-gcc7/llvm.src/llvm/include -fPIC -fno-semantic-interposition -fvisibility-inlines-hidden -Werror=date-time -fno-lifetime-dse -Wall -Wextra -Wno-unused-parameter -Wwrite-strings -Wcast-qual -Wno-missing-field-initializers -pedantic -Wno-long-long -Wimplicit-fallthrough -Wno-uninitialized -Wno-nonnull -Wno-noexcept-type -Wdelete-non-virtual-dtor -Wno-comment -Wno-misleading-indentation -fdiagnostics-color -ffunction-sections -fdata-sections -O3 -DNDEBUG  -fno-exceptions -funwind-tables -fno-rtti -UNDEBUG -std=c++1z -MD -MT lib/IR/CMakeFiles/LLVMCore.dir/Type.cpp.o -MF lib/IR/CMakeFiles/LLVMCore.dir/Type.cpp.o.d -o lib/IR/CMakeFiles/LLVMCore.dir/Type.cpp.o -c /vol/worker/mlir-nvidia/mlir-nvidia-gcc7/llvm.src/llvm/lib/IR/Type.cpp
In file included from /vol/worker/mlir-nvidia/mlir-nvidia-gcc7/llvm.src/llvm/lib/IR/Type.cpp:29:0:
/vol/worker/mlir-nvidia/mlir-nvidia-gcc7/llvm.src/llvm/include/llvm/TargetParser/RISCVTargetParser.h:46:12: error: declaration of ‘llvm::RISCV::CPUModel llvm::RISCV::CPUInfo::CPUModel’ [-fpermissive]
   CPUModel CPUModel;
            ^~~~~~~~
/vol/worker/mlir-nvidia/mlir-nvidia-gcc7/llvm.src/llvm/include/llvm/TargetParser/RISCVTargetParser.h:35:8: error: changes meaning of ‘CPUModel’ from ‘struct llvm::RISCV::CPUModel’ [-fpermissive]
 struct CPUModel {
        ^~~~~~~~
18.702 [1606/10/2984] Building CXX object lib/TargetParser/CMakeFiles/LLVMTargetParser.dir/RISCVTargetParser.cpp.o
FAILED: lib/TargetParser/CMakeFiles/LLVMTargetParser.dir/RISCVTargetParser.cpp.o 
CCACHE_CPP2=yes CCACHE_HASHDIR=yes /usr/bin/ccache /usr/bin/g++-7 -DGTEST_HAS_RTTI=0 -D_DEBUG -D_GLIBCXX_ASSERTIONS -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -I/vol/worker/mlir-nvidia/mlir-nvidia-gcc7/llvm.obj/lib/TargetParser -I/vol/worker/mlir-nvidia/mlir-nvidia-gcc7/llvm.src/llvm/lib/TargetParser -I/vol/worker/mlir-nvidia/mlir-nvidia-gcc7/llvm.obj/include -I/vol/worker/mlir-nvidia/mlir-nvidia-gcc7/llvm.src/llvm/include -fPIC -fno-semantic-interposition -fvisibility-inlines-hidden -Werror=date-time -fno-lifetime-dse -Wall -Wextra -Wno-unused-parameter -Wwrite-strings -Wcast-qual -Wno-missing-field-initializers -pedantic -Wno-long-long -Wimplicit-fallthrough -Wno-uninitialized -Wno-nonnull -Wno-noexcept-type -Wdelete-non-virtual-dtor -Wno-comment -Wno-misleading-indentation -fdiagnostics-color -ffunction-sections -fdata-sections -O3 -DNDEBUG  -fno-exceptions -funwind-tables -fno-rtti -UNDEBUG -std=c++1z -MD -MT lib/TargetParser/CMakeFiles/LLVMTargetParser.dir/RISCVTargetParser.cpp.o -MF lib/TargetParser/CMakeFiles/LLVMTargetParser.dir/RISCVTargetParser.cpp.o.d -o lib/TargetParser/CMakeFiles/LLVMTargetParser.dir/RISCVTargetParser.cpp.o -c /vol/worker/mlir-nvidia/mlir-nvidia-gcc7/llvm.src/llvm/lib/TargetParser/RISCVTargetParser.cpp
In file included from /vol/worker/mlir-nvidia/mlir-nvidia-gcc7/llvm.src/llvm/lib/TargetParser/RISCVTargetParser.cpp:14:0:
/vol/worker/mlir-nvidia/mlir-nvidia-gcc7/llvm.src/llvm/include/llvm/TargetParser/RISCVTargetParser.h:46:12: error: declaration of ‘llvm::RISCV::CPUModel llvm::RISCV::CPUInfo::CPUModel’ [-fpermissive]
   CPUModel CPUModel;
            ^~~~~~~~
/vol/worker/mlir-nvidia/mlir-nvidia-gcc7/llvm.src/llvm/include/llvm/TargetParser/RISCVTargetParser.h:35:8: error: changes meaning of ‘CPUModel’ from ‘struct llvm::RISCV::CPUModel’ [-fpermissive]
 struct CPUModel {
        ^~~~~~~~
19.726 [1606/9/2985] Building X86GenRegisterInfo.inc...
20.188 [1606/8/2986] Building X86GenRegisterBank.inc...
20.356 [1606/7/2987] Building CXX object lib/Object/CMakeFiles/LLVMObject.dir/IRSymtab.cpp.o
20.690 [1606/6/2988] Building X86GenDAGISel.inc...
22.620 [1606/5/2989] Building CXX object lib/Analysis/CMakeFiles/LLVMAnalysis.dir/ValueTracking.cpp.o
FAILED: lib/Analysis/CMakeFiles/LLVMAnalysis.dir/ValueTracking.cpp.o 
CCACHE_CPP2=yes CCACHE_HASHDIR=yes /usr/bin/ccache /usr/bin/g++-7 -DGTEST_HAS_RTTI=0 -DHAS_LOGF128 -D_DEBUG -D_GLIBCXX_ASSERTIONS -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -I/vol/worker/mlir-nvidia/mlir-nvidia-gcc7/llvm.obj/lib/Analysis -I/vol/worker/mlir-nvidia/mlir-nvidia-gcc7/llvm.src/llvm/lib/Analysis -I/vol/worker/mlir-nvidia/mlir-nvidia-gcc7/llvm.obj/include -I/vol/worker/mlir-nvidia/mlir-nvidia-gcc7/llvm.src/llvm/include -fPIC -fno-semantic-interposition -fvisibility-inlines-hidden -Werror=date-time -fno-lifetime-dse -Wall -Wextra -Wno-unused-parameter -Wwrite-strings -Wcast-qual -Wno-missing-field-initializers -pedantic -Wno-long-long -Wimplicit-fallthrough -Wno-uninitialized -Wno-nonnull -Wno-noexcept-type -Wdelete-non-virtual-dtor -Wno-comment -Wno-misleading-indentation -fdiagnostics-color -ffunction-sections -fdata-sections -O3 -DNDEBUG  -fno-exceptions -funwind-tables -fno-rtti -UNDEBUG -std=c++1z -MD -MT lib/Analysis/CMakeFiles/LLVMAnalysis.dir/ValueTracking.cpp.o -MF lib/Analysis/CMakeFiles/LLVMAnalysis.dir/ValueTracking.cpp.o.d -o lib/Analysis/CMakeFiles/LLVMAnalysis.dir/ValueTracking.cpp.o -c /vol/worker/mlir-nvidia/mlir-nvidia-gcc7/llvm.src/llvm/lib/Analysis/ValueTracking.cpp
In file included from /vol/worker/mlir-nvidia/mlir-nvidia-gcc7/llvm.src/llvm/lib/Analysis/ValueTracking.cpp:75:0:
/vol/worker/mlir-nvidia/mlir-nvidia-gcc7/llvm.src/llvm/include/llvm/TargetParser/RISCVTargetParser.h:46:12: error: declaration of ‘llvm::RISCV::CPUModel llvm::RISCV::CPUInfo::CPUModel’ [-fpermissive]
   CPUModel CPUModel;
            ^~~~~~~~
/vol/worker/mlir-nvidia/mlir-nvidia-gcc7/llvm.src/llvm/include/llvm/TargetParser/RISCVTargetParser.h:35:8: error: changes meaning of ‘CPUModel’ from ‘struct llvm::RISCV::CPUModel’ [-fpermissive]
 struct CPUModel {
        ^~~~~~~~
24.451 [1606/4/2990] Building X86GenInstrInfo.inc...
24.976 [1606/3/2991] Building CXX object lib/MC/MCParser/CMakeFiles/LLVMMCParser.dir/AsmParser.cpp.o
26.366 [1606/2/2992] Building X86GenSubtargetInfo.inc...
33.762 [1606/1/2993] Building CXX object lib/CodeGen/AsmPrinter/CMakeFiles/LLVMAsmPrinter.dir/AsmPrinter.cpp.o
In file included from /vol/worker/mlir-nvidia/mlir-nvidia-gcc7/llvm.src/llvm/include/llvm/CodeGen/MachineStableHash.h:17:0,
                 from /vol/worker/mlir-nvidia/mlir-nvidia-gcc7/llvm.src/llvm/include/llvm/CodeGen/MachineOutliner.h:21,

```

</details>

https://github.com/llvm/llvm-project/pull/116202