This is an archive of the discontinued LLVM Phabricator instance.

Differential D146346

[InstCombine] Add tests for indirect mul by power of 2; NFC
ClosedPublic

Authored by goldstein.w.n on Mar 17 2023, 7:04 PM.

Details

Reviewers
nikic
spatel
majnemer
Commits
rG40b637f46046: [InstCombine] Add tests for indirect mul by power of 2; NFC

Diff Detail

Unit TestsFailed

TimeTest
240 msx64 debian > Flang.Driver::code-gen-rv64.f90
100 msx64 debian > MLIR.Target/LLVMIR::llvmir-intrinsics.mlir

Event Timeline

goldstein.w.n created this revision.Mar 17 2023, 7:04 PM
Herald added a project: Restricted Project. · View Herald TranscriptMar 17 2023, 7:04 PM
goldstein.w.n requested review of this revision.Mar 17 2023, 7:04 PM
Herald added a project: Restricted Project. · View Herald TranscriptMar 17 2023, 7:04 PM
Herald added a subscriber: llvm-commits. · View Herald Transcript
goldstein.w.n retitled this revision from Add tests for indirect mul by power of 2; NFC to [InstCombine] Add tests for indirect mul by power of 2; NFC.Mar 17 2023, 7:05 PM
goldstein.w.n added reviewers: nikic, spatel, majnemer.
Herald added a subscriber: StephenFan. · View Herald TranscriptMar 17 2023, 7:05 PM
goldstein.w.n added a child revision: D146347: [InstCombine] Improve transforms for `(mul X, Y)` -> `(shl X, log2(Y)`.Mar 17 2023, 7:05 PM
Harbormaster completed remote builds in B220190: Diff 506256.Mar 17 2023, 7:28 PM
nikic added inline comments.Mar 18 2023, 4:55 AM
llvm/test/Transforms/InstCombine/mul-pow2.ll
63

Missing a commuted test -- everything here gets canonicalized to mul s, x.

Also missing a multi-use test. This is going to fail (as in, perform an unprofitable transform) due to open FIXMEs in takeLog2(), but we should at least highlight that the problem exists.

goldstein.w.n updated this revision to Diff 506320.Mar 18 2023, 1:51 PM

Put tests in canonical commuted form. Add multiuse tests

goldstein.w.n marked an inline comment as done.Mar 18 2023, 1:53 PM
goldstein.w.n updated this revision to Diff 506327.Mar 18 2023, 1:59 PM

Add flag propegation test

nikic accepted this revision.Mar 18 2023, 2:19 PM

LGTM

This revision is now accepted and ready to land.Mar 18 2023, 2:19 PM
Harbormaster completed remote builds in B220248: Diff 506327.Mar 18 2023, 2:49 PM
goldstein.w.n updated this revision to Diff 511773.Apr 7 2023, 12:34 PM

Rebase

This revision was landed with ongoing or failed builds.Apr 7 2023, 12:58 PM
Closed by commit rG40b637f46046: [InstCombine] Add tests for indirect mul by power of 2; NFC (authored by goldstein.w.n). · Explain Why
This revision was automatically updated to reflect the committed changes.
goldstein.w.n added a commit: rG40b637f46046: [InstCombine] Add tests for indirect mul by power of 2; NFC.
Harbormaster completed remote builds in B224274: Diff 511773.Apr 7 2023, 1:24 PM

Revision Contents

PathSize
llvm/
test/
Transforms/
InstCombine/
63 lines

Diff 506256

llvm/test/Transforms/InstCombine/mul-pow2.ll

  • This file was added.
; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
; RUN: opt -passes=instcombine -S < %s | FileCheck %s
define i8 @mul_x_selectp2(i8 %x, i1 %c) {
; CHECK-LABEL: @mul_x_selectp2(
; CHECK-NEXT: [[S:%.*]] = select i1 [[C:%.*]], i8 2, i8 4
; CHECK-NEXT: [[R:%.*]] = mul i8 [[S]], [[X:%.*]]
; CHECK-NEXT: ret i8 [[R]]
;
%s = select i1 %c, i8 2, i8 4
%r = mul i8 %x, %s
ret i8 %r
}
define i8 @mul_x_selectp2_non_const(i8 %x, i1 %c, i8 %yy) {
; CHECK-LABEL: @mul_x_selectp2_non_const(
; CHECK-NEXT: [[Y:%.*]] = shl nuw i8 1, [[YY:%.*]]
; CHECK-NEXT: [[S:%.*]] = select i1 [[C:%.*]], i8 2, i8 [[Y]]
; CHECK-NEXT: [[R:%.*]] = mul i8 [[S]], [[X:%.*]]
; CHECK-NEXT: ret i8 [[R]]
;
%y = shl i8 1, %yy
%s = select i1 %c, i8 2, i8 %y
%r = mul i8 %x, %s
ret i8 %r
}
define i8 @mul_selectp2_x(i8 %xx, i1 %c) {
; CHECK-LABEL: @mul_selectp2_x(
; CHECK-NEXT: [[X:%.*]] = mul i8 [[XX:%.*]], [[XX]]
; CHECK-NEXT: [[S:%.*]] = select i1 [[C:%.*]], i8 8, i8 1
; CHECK-NEXT: [[R:%.*]] = mul i8 [[S]], [[X]]
; CHECK-NEXT: ret i8 [[R]]
;
%x = mul i8 %xx, %xx
%s = select i1 %c, i8 8, i8 1
%r = mul i8 %s, %x
ret i8 %r
}
define i8 @mul_x_select_nonp2_fail(i8 %x, i1 %c) {
; CHECK-LABEL: @mul_x_select_nonp2_fail(
; CHECK-NEXT: [[S:%.*]] = select i1 [[C:%.*]], i8 2, i8 5
; CHECK-NEXT: [[R:%.*]] = mul i8 [[S]], [[X:%.*]]
; CHECK-NEXT: ret i8 [[R]]
;
%s = select i1 %c, i8 2, i8 5
%r = mul i8 %x, %s
ret i8 %r
}
define <2 x i8> @mul_selectp2_x_vec(<2 x i8> %xx, i1 %c) {
; CHECK-LABEL: @mul_selectp2_x_vec(
; CHECK-NEXT: [[X:%.*]] = mul <2 x i8> [[XX:%.*]], [[XX]]
; CHECK-NEXT: [[S:%.*]] = select i1 [[C:%.*]], <2 x i8> <i8 8, i8 16>, <2 x i8> <i8 4, i8 1>
; CHECK-NEXT: [[R:%.*]] = mul <2 x i8> [[S]], [[X]]
; CHECK-NEXT: ret <2 x i8> [[R]]
;
%x = mul <2 x i8> %xx, %xx
%s = select i1 %c, <2 x i8> <i8 8, i8 16>, <2 x i8> <i8 4, i8 1>
%r = mul <2 x i8> %s, %x
ret <2 x i8> %r
}
nikicUnsubmitted
Done
ReplyInline Actions

Missing a commuted test -- everything here gets canonicalized to mul s, x.

Also missing a multi-use test. This is going to fail (as in, perform an unprofitable transform) due to open FIXMEs in takeLog2(), but we should at least highlight that the problem exists.

nikic: Missing a commuted test -- everything here gets canonicalized to ` mul s, x`. Also missing a…