This is an archive of the discontinued LLVM Phabricator instance.

AMDGPU: Fix lit test checks with dag option
ClosedPublic

Authored by dstuttard on Nov 21 2019, 3:34 AM.

Details

Summary

I was seeing some failures on a test with slightly different instruction
ordering. Adding in some DAG directives solved the issue.

Change-Id: If5a3d3969055fb19279943bd45161bb70a3dabce

Diff Detail

Event Timeline

dstuttard created this revision.Nov 21 2019, 3:34 AM
Herald added a project: Restricted Project. · View Herald TranscriptNov 21 2019, 3:34 AM
rampitec added inline comments.Nov 21 2019, 11:30 AM
llvm/test/CodeGen/AMDGPU/llvm.amdgcn.mfma.ll
1328

AFAIK DAG-COUNT does not work.

dstuttard marked an inline comment as done.Nov 22 2019, 2:39 AM
dstuttard added inline comments.
llvm/test/CodeGen/AMDGPU/llvm.amdgcn.mfma.ll
1328

Yes, you're right. It just wasn't triggering the check at all - hence passing.
I'll re-submit with lots of GCN-DAG checks instead, unless you can think of a better way to do it.

dstuttard updated this revision to Diff 230623.Nov 22 2019, 3:23 AM

Replace COUNT-n with n DAG versions (DAG-COUNT-n doesn't work)

dstuttard marked an inline comment as done.Nov 22 2019, 3:23 AM
arsenm requested changes to this revision.Nov 22 2019, 6:58 AM
arsenm added a subscriber: arsenm.
arsenm added inline comments.
llvm/test/CodeGen/AMDGPU/llvm.amdgcn.mfma.ll
1328

Repeating -DAG doesn’t work either as far as I know. Might as well just generate this test

This revision now requires changes to proceed.Nov 22 2019, 6:58 AM
dstuttard marked an inline comment as done.Nov 22 2019, 7:08 AM
dstuttard added inline comments.
llvm/test/CodeGen/AMDGPU/llvm.amdgcn.mfma.ll
1328

Doesn't it? The other tests in this file do this.

Problem is that I'm seeing different ordering of the mov instructions - hence requiring the DAG variants.
Doesn't the -DAG here mean that FileCheck is expecting to see the starting LABEL, then 2 mov's 8 global_load_dwordx4's and 16 v_accvgpr_write_b32's in any order, followed by the v_mfma instruction?

rampitec accepted this revision.Nov 22 2019, 9:11 AM

LGTM. Repeating -DAG statements do work, just verified.

Matt - are you happy for this to proceed?

This revision was not accepted when it landed; it landed in state Needs Revision.Nov 28 2019, 2:06 AM
This revision was automatically updated to reflect the committed changes.