Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[M68k] update dissassmbly test to require atLeastM68020 for BSR32 #119758

Merged
merged 1 commit into from
Dec 12, 2024
Merged

[M68k] update dissassmbly test to require atLeastM68020 for BSR32 #119758

merged 1 commit into from
Dec 12, 2024
+1 −1

Conversation

knickish
Copy link
Contributor

Fixes test failure reported in #117371. BSR32 was previously (incorrectly) allowed for CPUs <M68020, this test was missed while updating the rest to fit the new model

@knickish knickish marked this pull request as ready for review December 12, 2024 21:06
@llvmbot llvmbot added mc Machine (object) code backend:m68k labels Dec 12, 2024
@knickish knickish mentioned this pull request Dec 12, 2024
Merged
@llvmbot
Copy link
Member

llvmbot commented Dec 12, 2024 •
edited
Loading

@llvm/pr-subscribers-backend-m68k

@llvm/pr-subscribers-mc

Author: None (knickish)

Changes

Fixes test failure reported in #117371. BSR32 was previously (incorrectly) allowed for CPUs <M68020, this test was missed while updating the rest to fit the new model

Full diff: https://github.com/llvm/llvm-project/pull/119758.diff

1 Files Affected:

  • (modified) llvm/test/MC/Disassembler/M68k/control.txt (+1-1)
diff --git a/llvm/test/MC/Disassembler/M68k/control.txt b/llvm/test/MC/Disassembler/M68k/control.txt
index d722dfd791fa9e..58d5629855838c 100644
--- a/llvm/test/MC/Disassembler/M68k/control.txt
+++ b/llvm/test/MC/Disassembler/M68k/control.txt
@@ -1,4 +1,4 @@
-# RUN: llvm-mc -disassemble -triple m68k %s | FileCheck %s
+# RUN: llvm-mc -disassemble -triple m68k -mcpu=M68020 %s | FileCheck %s
 
 # CHECK: bra $0
 0x60 0x00 0x00 0x00

@mshockwave mshockwave self-requested a review December 12, 2024 21:09
mshockwave
mshockwave approved these changes Dec 12, 2024
View reviewed changes
Copy link
Member

@mshockwave mshockwave left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks for the quick fix

@knickish
Copy link
Contributor Author

Of course. #119142 still hasn't been approved yet, so can't hit merge myself

@mshockwave mshockwave merged commit 9b65b1e into llvm:main Dec 12, 2024
10 of 12 checks passed
@llvm-ci
Copy link
Collaborator

llvm-ci commented Dec 12, 2024

LLVM Buildbot has detected a new failure on builder libc-riscv64-debian-fullbuild-dbg running on libc-riscv64-debian while building llvm at step 4 "annotate".

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

Here is the relevant piece of the build log for the reference 
Step 4 (annotate) failure: 'python ../llvm-zorg/zorg/buildbot/builders/annotated/libc-linux.py ...' (failure)
...
-- Registering Bye as a pass plugin (static build: OFF)
-- Google Benchmark version: v0.0.0, normalized to 0.0.0
-- Enabling additional flags: -DINCLUDE_DIRECTORIES=/home/libc_worker/libc-riscv64-debian/libc-riscv64-debian-fullbuild-dbg/llvm-project/third-party/benchmark/include
-- Performing Test HAVE_THREAD_SAFETY_ATTRIBUTES -- success
-- Performing Test HAVE_GNU_POSIX_REGEX -- failed to compile
-- Performing Test HAVE_POSIX_REGEX -- success
-- Performing Test HAVE_STEADY_CLOCK -- success
-- Performing Test HAVE_PTHREAD_AFFINITY -- failed to compile
-- Configuring incomplete, errors occurred!
See also "/home/libc_worker/libc-riscv64-debian/libc-riscv64-debian-fullbuild-dbg/build/CMakeFiles/CMakeOutput.log".
See also "/home/libc_worker/libc-riscv64-debian/libc-riscv64-debian-fullbuild-dbg/build/CMakeFiles/CMakeError.log".
['cmake', '../llvm-project/llvm', '-GNinja', '-DLLVM_ENABLE_RUNTIMES=libc', '-DCMAKE_C_COMPILER=clang', '-DCMAKE_CXX_COMPILER=clang++', '-DCMAKE_BUILD_TYPE=Debug', '-DLLVM_LIBC_FULL_BUILD=ON'] exited with return code 1.
The build step threw an exception...
Traceback (most recent call last):
  File "/home/libc_worker/libc-riscv64-debian/libc-riscv64-debian-fullbuild-dbg/build/../llvm-zorg/zorg/buildbot/builders/annotated/libc-linux.py", line 160, in step
    yield
  File "/home/libc_worker/libc-riscv64-debian/libc-riscv64-debian-fullbuild-dbg/build/../llvm-zorg/zorg/buildbot/builders/annotated/libc-linux.py", line 116, in main
    run_command(['cmake', os.path.join(source_dir, 'llvm')] + cmake_args)
  File "/home/libc_worker/libc-riscv64-debian/libc-riscv64-debian-fullbuild-dbg/build/../llvm-zorg/zorg/buildbot/builders/annotated/libc-linux.py", line 175, in run_command
    util.report_run_cmd(cmd, cwd=directory)
  File "/home/libc_worker/libc-riscv64-debian/libc-riscv64-debian-fullbuild-dbg/llvm-zorg/zorg/buildbot/builders/annotated/util.py", line 49, in report_run_cmd
    subprocess.check_call(cmd, shell=shell, *args, **kwargs)
  File "/usr/lib/python3.10/subprocess.py", line 369, in check_call
    raise CalledProcessError(retcode, cmd)
subprocess.CalledProcessError: Command '['cmake', '../llvm-project/llvm', '-GNinja', '-DLLVM_ENABLE_RUNTIMES=libc', '-DCMAKE_C_COMPILER=clang', '-DCMAKE_CXX_COMPILER=clang++', '-DCMAKE_BUILD_TYPE=Debug', '-DLLVM_LIBC_FULL_BUILD=ON']' returned non-zero exit status 1.
@@@STEP_FAILURE@@@
@@@BUILD_STEP build libc@@@
Running: ninja libc
[0/1] Re-running CMake...
CMake Warning at CMakeLists.txt:154 (message):
  Using LLVM_ENABLE_PROJECTS=libc is deprecated now, and will become a fatal
  error in the LLVM 21 release.  Please use -DLLVM_ENABLE_RUNTIMES=libc or
  see the instructions at https://libc.llvm.org/ for building the runtimes.


-- bolt project is disabled
-- clang project is disabled
-- clang-tools-extra project is disabled
-- compiler-rt project is disabled
-- cross-project-tests project is disabled
-- libc project is enabled
-- libclc project is disabled
-- lld project is disabled
-- lldb project is disabled
-- mlir project is disabled
-- openmp project is disabled
-- polly project is disabled
-- pstl project is disabled
-- flang project is disabled
-- Could NOT find LibEdit (missing: LibEdit_INCLUDE_DIRS LibEdit_LIBRARIES) 
Step 5 (cmake) failure: cmake (failure)
...
  runtimes/CMakeLists.txt:261 (llvm_ExternalProject_Add)
  runtimes/CMakeLists.txt:554 (runtime_default_target)


CMake Error at cmake/modules/LLVMExternalProjectUtils.cmake:453 (add_custom_target):
  add_custom_target cannot create target "install-libc-stripped" because
  another target with the same name already exists.  The existing target is a
  custom target created in source directory
  "/home/libc_worker/libc-riscv64-debian/libc-riscv64-debian-fullbuild-dbg/llvm-project/libc/lib".
  See documentation for policy CMP0002 for more details.
Call Stack (most recent call first):
  runtimes/CMakeLists.txt:261 (llvm_ExternalProject_Add)
  runtimes/CMakeLists.txt:554 (runtime_default_target)


CMake Error at cmake/modules/LLVMExternalProjectUtils.cmake:453 (add_custom_target):
  add_custom_target cannot create target "check-libc" because another target
  with the same name already exists.  The existing target is a custom target
  created in source directory
  "/home/libc_worker/libc-riscv64-debian/libc-riscv64-debian-fullbuild-dbg/llvm-project/libc/test".
  See documentation for policy CMP0002 for more details.
Call Stack (most recent call first):
  runtimes/CMakeLists.txt:261 (llvm_ExternalProject_Add)
  runtimes/CMakeLists.txt:554 (runtime_default_target)
-- Registering ExampleIRTransforms as a pass plugin (static build: OFF)
-- Registering Bye as a pass plugin (static build: OFF)
-- Google Benchmark version: v0.0.0, normalized to 0.0.0
-- Enabling additional flags: -DINCLUDE_DIRECTORIES=/home/libc_worker/libc-riscv64-debian/libc-riscv64-debian-fullbuild-dbg/llvm-project/third-party/benchmark/include
-- Performing Test HAVE_THREAD_SAFETY_ATTRIBUTES -- success
-- Performing Test HAVE_GNU_POSIX_REGEX -- failed to compile
-- Performing Test HAVE_POSIX_REGEX -- success
-- Performing Test HAVE_STEADY_CLOCK -- success
-- Performing Test HAVE_PTHREAD_AFFINITY -- failed to compile
-- Configuring incomplete, errors occurred!
See also "/home/libc_worker/libc-riscv64-debian/libc-riscv64-debian-fullbuild-dbg/build/CMakeFiles/CMakeOutput.log".
See also "/home/libc_worker/libc-riscv64-debian/libc-riscv64-debian-fullbuild-dbg/build/CMakeFiles/CMakeError.log".
['cmake', '../llvm-project/llvm', '-GNinja', '-DLLVM_ENABLE_RUNTIMES=libc', '-DCMAKE_C_COMPILER=clang', '-DCMAKE_CXX_COMPILER=clang++', '-DCMAKE_BUILD_TYPE=Debug', '-DLLVM_LIBC_FULL_BUILD=ON'] exited with return code 1.
The build step threw an exception...
Traceback (most recent call last):
  File "/home/libc_worker/libc-riscv64-debian/libc-riscv64-debian-fullbuild-dbg/build/../llvm-zorg/zorg/buildbot/builders/annotated/libc-linux.py", line 160, in step
    yield
  File "/home/libc_worker/libc-riscv64-debian/libc-riscv64-debian-fullbuild-dbg/build/../llvm-zorg/zorg/buildbot/builders/annotated/libc-linux.py", line 116, in main
    run_command(['cmake', os.path.join(source_dir, 'llvm')] + cmake_args)
  File "/home/libc_worker/libc-riscv64-debian/libc-riscv64-debian-fullbuild-dbg/build/../llvm-zorg/zorg/buildbot/builders/annotated/libc-linux.py", line 175, in run_command
    util.report_run_cmd(cmd, cwd=directory)
  File "/home/libc_worker/libc-riscv64-debian/libc-riscv64-debian-fullbuild-dbg/llvm-zorg/zorg/buildbot/builders/annotated/util.py", line 49, in report_run_cmd
    subprocess.check_call(cmd, shell=shell, *args, **kwargs)
  File "/usr/lib/python3.10/subprocess.py", line 369, in check_call
    raise CalledProcessError(retcode, cmd)
subprocess.CalledProcessError: Command '['cmake', '../llvm-project/llvm', '-GNinja', '-DLLVM_ENABLE_RUNTIMES=libc', '-DCMAKE_C_COMPILER=clang', '-DCMAKE_CXX_COMPILER=clang++', '-DCMAKE_BUILD_TYPE=Debug', '-DLLVM_LIBC_FULL_BUILD=ON']' returned non-zero exit status 1.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mshockwave mshockwave mshockwave approved these changes

Assignees
No one assigned
Labels
backend:m68k mc Machine (object) code
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@knickish @llvmbot @llvm-ci @mshockwave