This is an archive of the discontinued LLVM Phabricator instance.

Differential D64010

GlobalISel: Verify G_MERGE_VALUES operand sizes
ClosedPublic

Authored by arsenm on Jul 1 2019, 7:52 AM.

Details

Reviewers
aemerson
aditya_nandakumar
paquette

Diff Detail

Event Timeline

arsenm created this revision.Jul 1 2019, 7:52 AM
Herald added subscribers: Petar.Avramovic, kristof.beyls, rovka, wdng. · View Herald TranscriptJul 1 2019, 7:52 AM
paquette accepted this revision.Jul 1 2019, 9:46 AM

LGTM

This revision is now accepted and ready to land.Jul 1 2019, 9:46 AM
arsenm closed this revision.Jul 1 2019, 11:01 AM

r364822 + fix missing verifying individual sources are consistent

Revision Contents

PathSize
lib/
CodeGen/
4 lines
test/
MachineVerifier/
23 lines

Diff 207307

lib/CodeGen/MachineVerifier.cpp

Show First 20 Lines • Show All 1,170 Lines • ▼ Show 20 Lines case TargetOpcode::G_MERGE_VALUES: {
// G_MERGE_VALUES should only be used to merge scalars into a larger scalar, // G_MERGE_VALUES should only be used to merge scalars into a larger scalar,
// e.g. s2N = MERGE sN, sN // e.g. s2N = MERGE sN, sN
// Merging multiple scalars into a vector is not allowed, should use // Merging multiple scalars into a vector is not allowed, should use
// G_BUILD_VECTOR for that. // G_BUILD_VECTOR for that.
LLT DstTy = MRI->getType(MI->getOperand(0).getReg()); LLT DstTy = MRI->getType(MI->getOperand(0).getReg());
LLT SrcTy = MRI->getType(MI->getOperand(1).getReg()); LLT SrcTy = MRI->getType(MI->getOperand(1).getReg());
if (DstTy.isVector() || SrcTy.isVector()) if (DstTy.isVector() || SrcTy.isVector())
report("G_MERGE_VALUES cannot operate on vectors", MI); report("G_MERGE_VALUES cannot operate on vectors", MI);
if (DstTy.getSizeInBits() !=
SrcTy.getSizeInBits() * (MI->getNumOperands() - 1))
report("G_MERGE_VALUES result size is inconsistent", MI);
break; break;
} }
case TargetOpcode::G_UNMERGE_VALUES: { case TargetOpcode::G_UNMERGE_VALUES: {
LLT DstTy = MRI->getType(MI->getOperand(0).getReg()); LLT DstTy = MRI->getType(MI->getOperand(0).getReg());
LLT SrcTy = MRI->getType(MI->getOperand(MI->getNumOperands()-1).getReg()); LLT SrcTy = MRI->getType(MI->getOperand(MI->getNumOperands()-1).getReg());
// For now G_UNMERGE can split vectors. // For now G_UNMERGE can split vectors.
for (unsigned i = 0; i < MI->getNumOperands()-1; ++i) { for (unsigned i = 0; i < MI->getNumOperands()-1; ++i) {
if (MRI->getType(MI->getOperand(i).getReg()) != DstTy) if (MRI->getType(MI->getOperand(i).getReg()) != DstTy)
▲ Show 20 Lines • Show All 1,549 Lines • Show Last 20 Lines

test/MachineVerifier/test_g_merge_values.mir

  • This file was added.
# RUN: not llc -o - -march=arm64 -run-pass=none -verify-machineinstrs %s 2>&1 | FileCheck %s
# REQUIRES: aarch64-registered-target
---
name: g_merge_values
tracksRegLiveness: true
liveins:
body: |
bb.0:
%0:_(s32) = IMPLICIT_DEF
%1:_(s32) = IMPLICIT_DEF
%2:_(<2 x s32>) = IMPLICIT_DEF
%3:_(<2 x s32>) = IMPLICIT_DEF
; CHECK: Bad machine code: G_MERGE_VALUES cannot operate on vectors
%4:_(<4 x s32>) = G_MERGE_VALUES %2, %3
; CHECK: Bad machine code: G_MERGE_VALUES result size is inconsistent
%5:_(s64) = G_MERGE_VALUES %0
; CHECK: Bad machine code: G_MERGE_VALUES result size is inconsistent
%6:_(s64) = G_MERGE_VALUES %0, %1, %1
...