This is an archive of the discontinued LLVM Phabricator instance.

Differential D155053

[AggressiveInstCombine] Fold strcmp for short string literals tests
ClosedPublic

Authored by kitaisreal on Jul 12 2023, 2:25 AM.

Details

Reviewers
nikic
xbolva00
efriedma
Commits
rGf9d1895d65a1: [AggressiveInstCombine] Fold strcmp for short string literals tests (NFC)
Summary

Precommit tests for D154725.

Diff Detail

Event Timeline

kitaisreal created this revision.Jul 12 2023, 2:25 AM
Herald added a subscriber: StephenFan. · View Herald TranscriptJul 12 2023, 2:25 AM
kitaisreal requested review of this revision.Jul 12 2023, 2:25 AM
Herald added a subscriber: llvm-commits. · View Herald TranscriptJul 12 2023, 2:25 AM
kitaisreal mentioned this in D154725: [AggressiveInstCombine] Fold strcmp for short string literals.Jul 12 2023, 2:26 AM
xbolva00 added a comment.Jul 12 2023, 2:35 AM

fold -> expand? or inline?

We are not folding anything, right?

kitaisreal added a comment.Jul 12 2023, 3:11 AM

Thanks. Expand is much better than fold.

kitaisreal updated this revision to Diff 539466.Jul 12 2023, 3:14 AM

Rename fold into expand.

xbolva00 added inline comments.Jul 12 2023, 3:40 AM
llvm/test/Transforms/AggressiveInstCombine/strcmp.ll
10

Add test with different lengths of string literals,
x, xx, xxxx, etc

kitaisreal updated this revision to Diff 539491.Jul 12 2023, 4:15 AM

Added tests for different string sizes.

kitaisreal marked an inline comment as done.Jul 12 2023, 5:20 AM
Harbormaster completed remote builds in B244743: Diff 539491.Jul 12 2023, 7:17 AM
kitaisreal updated this revision to Diff 540019.Jul 13 2023, 7:20 AM

Updated tests.

kitaisreal added a child revision: D154725: [AggressiveInstCombine] Fold strcmp for short string literals.Jul 13 2023, 7:21 AM
Harbormaster completed remote builds in B245109: Diff 540019.Jul 13 2023, 9:15 AM
kitaisreal updated this revision to Diff 541565.Jul 18 2023, 8:36 AM

Updated tests.

nikic accepted this revision.Jul 18 2023, 11:27 AM

LGTM

llvm/test/Transforms/AggressiveInstCombine/strcmp.ll
21

Drop all the noundef attributes, they shouldn't be relevant for this transform.

This revision is now accepted and ready to land.Jul 18 2023, 11:27 AM
Harbormaster completed remote builds in B246248: Diff 541565.Jul 18 2023, 3:24 PM
This revision was landed with ongoing or failed builds.Jul 19 2023, 7:54 AM
Closed by commit rGf9d1895d65a1: [AggressiveInstCombine] Fold strcmp for short string literals tests (NFC) (authored by kitaisreal, committed by nikic). · Explain Why
This revision was automatically updated to reflect the committed changes.
nikic added a commit: rGf9d1895d65a1: [AggressiveInstCombine] Fold strcmp for short string literals tests (NFC).

Revision Contents

PathSize
llvm/
test/
Transforms/
AggressiveInstCombine/
164 lines

Diff 542028

llvm/test/Transforms/AggressiveInstCombine/strcmp.ll

  • This file was added.
; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
; RUN: opt < %s -passes=aggressive-instcombine -S | FileCheck %s
declare i32 @strcmp(ptr, ptr)
@s0 = constant [1 x i8] c"\00"
@s1 = constant [2 x i8] c"0\00"
@s2 = constant [3 x i8] c"01\00"
@s3 = constant [4 x i8] c"012\00"
@s4 = constant [5 x i8] c"0123\00"
xbolva00Unsubmitted
Done
ReplyInline Actions

Add test with different lengths of string literals,
x, xx, xxxx, etc

xbolva00: Add test with different lengths of string literals, x, xx, xxxx, etc
; Expand strcmp(C, "x").
define i1 @expand_strcmp_s0(ptr %C) {
; CHECK-LABEL: @expand_strcmp_s0(
; CHECK-NEXT: [[CALL:%.*]] = call i32 @strcmp(ptr [[C:%.*]], ptr @s0)
; CHECK-NEXT: [[CMP:%.*]] = icmp eq i32 [[CALL]], 0
; CHECK-NEXT: ret i1 [[CMP]]
;
%call = call i32 @strcmp(ptr %C, ptr @s0)
%cmp = icmp eq i32 %call, 0
nikicUnsubmitted
Not Done
ReplyInline Actions

Drop all the noundef attributes, they shouldn't be relevant for this transform.

nikic: Drop all the `noundef` attributes, they shouldn't be relevant for this transform.
ret i1 %cmp
}
define i1 @expand_strcmp_eq_s1(ptr %C) {
; CHECK-LABEL: @expand_strcmp_eq_s1(
; CHECK-NEXT: [[CALL:%.*]] = call i32 @strcmp(ptr [[C:%.*]], ptr @s1)
; CHECK-NEXT: [[CMP:%.*]] = icmp eq i32 [[CALL]], 0
; CHECK-NEXT: ret i1 [[CMP]]
;
%call = call i32 @strcmp(ptr %C, ptr @s1)
%cmp = icmp eq i32 %call, 0
ret i1 %cmp
}
define i1 @expand_strcmp_eq_s1_commuted(ptr %C) {
; CHECK-LABEL: @expand_strcmp_eq_s1_commuted(
; CHECK-NEXT: [[CALL:%.*]] = call i32 @strcmp(ptr @s1, ptr [[C:%.*]])
; CHECK-NEXT: [[CMP:%.*]] = icmp eq i32 [[CALL]], 0
; CHECK-NEXT: ret i1 [[CMP]]
;
%call = call i32 @strcmp(ptr @s1, ptr %C)
%cmp = icmp eq i32 %call, 0
ret i1 %cmp
}
define i1 @expand_strcmp_ne_s1(ptr %C) {
; CHECK-LABEL: @expand_strcmp_ne_s1(
; CHECK-NEXT: [[CALL:%.*]] = call i32 @strcmp(ptr [[C:%.*]], ptr @s1)
; CHECK-NEXT: [[CMP:%.*]] = icmp ne i32 [[CALL]], 0
; CHECK-NEXT: ret i1 [[CMP]]
;
%call = call i32 @strcmp(ptr %C, ptr @s1)
%cmp = icmp ne i32 %call, 0
ret i1 %cmp
}
define i1 @expand_strcmp_sgt_s1(ptr %C) {
; CHECK-LABEL: @expand_strcmp_sgt_s1(
; CHECK-NEXT: [[CALL:%.*]] = call i32 @strcmp(ptr [[C:%.*]], ptr @s1)
; CHECK-NEXT: [[CMP:%.*]] = icmp sgt i32 [[CALL]], 0
; CHECK-NEXT: ret i1 [[CMP]]
;
%call = call i32 @strcmp(ptr %C, ptr @s1)
%cmp = icmp sgt i32 %call, 0
ret i1 %cmp
}
define i1 @expand_strcmp_sge_s1(ptr %C) {
; CHECK-LABEL: @expand_strcmp_sge_s1(
; CHECK-NEXT: [[CALL:%.*]] = call i32 @strcmp(ptr [[C:%.*]], ptr @s1)
; CHECK-NEXT: [[CMP:%.*]] = icmp sge i32 [[CALL]], 0
; CHECK-NEXT: ret i1 [[CMP]]
;
%call = call i32 @strcmp(ptr %C, ptr @s1)
%cmp = icmp sge i32 %call, 0
ret i1 %cmp
}
define i1 @expand_strcmp_slt_s1(ptr %C) {
; CHECK-LABEL: @expand_strcmp_slt_s1(
; CHECK-NEXT: [[CALL:%.*]] = call i32 @strcmp(ptr [[C:%.*]], ptr @s1)
; CHECK-NEXT: [[CMP:%.*]] = icmp slt i32 [[CALL]], 0
; CHECK-NEXT: ret i1 [[CMP]]
;
%call = call i32 @strcmp(ptr %C, ptr @s1)
%cmp = icmp slt i32 %call, 0
ret i1 %cmp
}
define i1 @expand_strcmp_sle_s1(ptr %C) {
; CHECK-LABEL: @expand_strcmp_sle_s1(
; CHECK-NEXT: [[CALL:%.*]] = call i32 @strcmp(ptr [[C:%.*]], ptr @s1)
; CHECK-NEXT: [[CMP:%.*]] = icmp sle i32 [[CALL]], 0
; CHECK-NEXT: ret i1 [[CMP]]
;
%call = call i32 @strcmp(ptr %C, ptr @s1)
%cmp = icmp sle i32 %call, 0
ret i1 %cmp
}
define i1 @expand_strcmp_s1_fail_1(ptr %C) {
; CHECK-LABEL: @expand_strcmp_s1_fail_1(
; CHECK-NEXT: [[CALL:%.*]] = call i32 @strcmp(ptr [[C:%.*]], ptr @s1)
; CHECK-NEXT: [[CMP:%.*]] = icmp eq i32 [[CALL]], 1
; CHECK-NEXT: ret i1 [[CMP]]
;
%call = call i32 @strcmp(ptr %C, ptr @s1)
%cmp = icmp eq i32 %call, 1
ret i1 %cmp
}
define i1 @expand_strcmp_s1_fail_2(ptr %C) {
; CHECK-LABEL: @expand_strcmp_s1_fail_2(
; CHECK-NEXT: [[CALL:%.*]] = call i32 @strcmp(ptr @s1, ptr @s1)
; CHECK-NEXT: [[CMP:%.*]] = icmp eq i32 [[CALL]], 0
; CHECK-NEXT: ret i1 [[CMP]]
;
%call = call i32 @strcmp(ptr @s1, ptr @s1)
%cmp = icmp eq i32 %call, 0
ret i1 %cmp
}
define i32 @expand_strcmp_s1_fail_3(ptr %C) {
; CHECK-LABEL: @expand_strcmp_s1_fail_3(
; CHECK-NEXT: [[CALL:%.*]] = call i32 @strcmp(ptr [[C:%.*]], ptr @s1)
; CHECK-NEXT: ret i32 [[CALL]]
;
%call = call i32 @strcmp(ptr %C, ptr @s1)
ret i32 %call
}
define i1 @expand_strcmp_s2(ptr %C) {
; CHECK-LABEL: @expand_strcmp_s2(
; CHECK-NEXT: [[CALL:%.*]] = call i32 @strcmp(ptr [[C:%.*]], ptr @s2)
; CHECK-NEXT: [[CMP:%.*]] = icmp eq i32 [[CALL]], 0
; CHECK-NEXT: ret i1 [[CMP]]
;
%call = call i32 @strcmp(ptr %C, ptr @s2)
%cmp = icmp eq i32 %call, 0
ret i1 %cmp
}
define i1 @expand_strcmp_s3(ptr %C) {
; CHECK-LABEL: @expand_strcmp_s3(
; CHECK-NEXT: [[CALL:%.*]] = call i32 @strcmp(ptr [[C:%.*]], ptr @s3)
; CHECK-NEXT: [[CMP:%.*]] = icmp eq i32 [[CALL]], 0
; CHECK-NEXT: ret i1 [[CMP]]
;
%call = call i32 @strcmp(ptr %C, ptr @s3)
%cmp = icmp eq i32 %call, 0
ret i1 %cmp
}
define i1 @expand_strcmp_s4(ptr %C) {
; CHECK-LABEL: @expand_strcmp_s4(
; CHECK-NEXT: [[CALL:%.*]] = call i32 @strcmp(ptr [[C:%.*]], ptr @s4)
; CHECK-NEXT: [[CMP:%.*]] = icmp eq i32 [[CALL]], 0
; CHECK-NEXT: ret i1 [[CMP]]
;
%call = call i32 @strcmp(ptr %C, ptr @s4)
%cmp = icmp eq i32 %call, 0
ret i1 %cmp
}