[clang] [clang][CodeGen] Add range metadata for atomic load of boolean type. #131476 (PR #133546)
https://github.com/janagor updated https://github.com/llvm/llvm-project/pull/133546 From 4581169d6fbe72357bb83b95fe36c8cc606efa1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20G=C3=B3rski?= Date: Fri, 28 Mar 2025 23:36:18 +0100 Subject: [PATCH 1/6] [clang][CodeGen] Added llvm ir pre-commit test. --- clang/test/CodeGen/atomic-ops-load.c | 11 +++ 1 file changed, 11 insertions(+) create mode 100644 clang/test/CodeGen/atomic-ops-load.c diff --git a/clang/test/CodeGen/atomic-ops-load.c b/clang/test/CodeGen/atomic-ops-load.c new file mode 100644 index 0..adcaf9a2112fa --- /dev/null +++ b/clang/test/CodeGen/atomic-ops-load.c @@ -0,0 +1,11 @@ +// RUN: %clang_cc1 -triple riscv64 -O1 -emit-llvm %s -o - | FileCheck %s +#include + +extern bool t1; +bool test1(void) { +// CHECK-LABEL: define{{.*}} i1 @test1 +// CHECK: load atomic i8, ptr @t1 monotonic, align 1 +// CHECK-NEXT: trunc i8 %{{.*}} to i1 +// CHECK-NEXT: ret i1 %{{.*}} + return __atomic_load_n(&t1, __ATOMIC_RELAXED); +} From 852b691fac487b3cef7b0df8875c26573bc58daa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20G=C3=B3rski?= Date: Sat, 29 Mar 2025 00:53:23 +0100 Subject: [PATCH 2/6] [clang][CodeGen] Added `!range` metadata to atomic load for `bool`. --- clang/lib/CodeGen/CGAtomic.cpp | 23 +++ clang/test/CodeGen/atomic-ops-load.c | 4 ++-- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/clang/lib/CodeGen/CGAtomic.cpp b/clang/lib/CodeGen/CGAtomic.cpp index 3adb2a7ad207f..70ae7180a9adc 100644 --- a/clang/lib/CodeGen/CGAtomic.cpp +++ b/clang/lib/CodeGen/CGAtomic.cpp @@ -590,6 +590,29 @@ static void EmitAtomicOp(CodeGenFunction &CGF, AtomicExpr *E, Address Dest, llvm::LoadInst *Load = CGF.Builder.CreateLoad(Ptr); Load->setAtomic(Order, Scope); Load->setVolatile(E->isVolatile()); + +if (CGF.CGM.getCodeGenOpts().OptimizationLevel == 0) { + CGF.Builder.CreateStore(Load, Dest); + return; +} + +QualType Ty = E->getValueType(); +if (!Ty->isBooleanType()) { + CGF.Builder.CreateStore(Load, Dest); + return; +} + +llvm::MDBuilder MDHelper(CGF.getLLVMContext()); +llvm::APInt BooleanMin = llvm::APInt(CGF.getContext().getTypeSize(Ty), 0); +llvm::APInt BooleanEnd = llvm::APInt(CGF.getContext().getTypeSize(Ty), 2); + +if (llvm::MDNode *RangeInfo = +MDHelper.createRange(BooleanMin, BooleanEnd)) { + Load->setMetadata(llvm::LLVMContext::MD_range, RangeInfo); + Load->setMetadata(llvm::LLVMContext::MD_noundef, + llvm::MDNode::get(CGF.getLLVMContext(), {})); +} + CGF.Builder.CreateStore(Load, Dest); return; } diff --git a/clang/test/CodeGen/atomic-ops-load.c b/clang/test/CodeGen/atomic-ops-load.c index adcaf9a2112fa..778a7ebdc2618 100644 --- a/clang/test/CodeGen/atomic-ops-load.c +++ b/clang/test/CodeGen/atomic-ops-load.c @@ -4,8 +4,8 @@ extern bool t1; bool test1(void) { // CHECK-LABEL: define{{.*}} i1 @test1 -// CHECK: load atomic i8, ptr @t1 monotonic, align 1 -// CHECK-NEXT: trunc i8 %{{.*}} to i1 +// CHECK: load atomic i8, ptr @t1 monotonic, align 1, !range ![[$WS_RANGE:[0-9]*]], !noundef !{{[0-9]+}} +// CHECK-NEXT: trunc nuw i8 %{{.*}} to i1 // CHECK-NEXT: ret i1 %{{.*}} return __atomic_load_n(&t1, __ATOMIC_RELAXED); } From e42772bbc0851696d73ded4abc3edf651f4e8b41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20G=C3=B3rski?= Date: Sat, 29 Mar 2025 01:12:18 +0100 Subject: [PATCH 3/6] Updated codestyle. --- clang/lib/CodeGen/CGAtomic.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/clang/lib/CodeGen/CGAtomic.cpp b/clang/lib/CodeGen/CGAtomic.cpp index 70ae7180a9adc..2c9613deef744 100644 --- a/clang/lib/CodeGen/CGAtomic.cpp +++ b/clang/lib/CodeGen/CGAtomic.cpp @@ -607,10 +607,10 @@ static void EmitAtomicOp(CodeGenFunction &CGF, AtomicExpr *E, Address Dest, llvm::APInt BooleanEnd = llvm::APInt(CGF.getContext().getTypeSize(Ty), 2); if (llvm::MDNode *RangeInfo = -MDHelper.createRange(BooleanMin, BooleanEnd)) { +MDHelper.createRange(BooleanMin, BooleanEnd)) { Load->setMetadata(llvm::LLVMContext::MD_range, RangeInfo); Load->setMetadata(llvm::LLVMContext::MD_noundef, - llvm::MDNode::get(CGF.getLLVMContext(), {})); +llvm::MDNode::get(CGF.getLLVMContext(), {})); } CGF.Builder.CreateStore(Load, Dest); From c95f16cf2df51e8f7a1d4952918c977104271072 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20G=C3=B3rski?= Date: Fri, 4 Apr 2025 11:20:30 +0200 Subject: [PATCH 4/6] Refactored early returns into normal if statement. --- clang/lib/CodeGen/CGAtomic.cpp | 29 ++--- 1 file changed, 10 insertions(+), 19 deletions(-) diff --git a/clang/lib/CodeGen/CGAtomic.cpp b/clang/lib/CodeGen/CGAtomic.cpp index 2c9613deef744..c40bf3cd77d86 100644 --- a/clang/lib/CodeGen/CGAtomic.cpp +++ b/clang/lib/CodeGen/CGAtomic.cpp @@ -591,26 +591,17 @@ static void EmitAtom
[clang] [clang][CodeGen] Add range metadata for atomic load of boolean type. #131476 (PR #133546)
https://github.com/janagor updated https://github.com/llvm/llvm-project/pull/133546 From 4581169d6fbe72357bb83b95fe36c8cc606efa1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20G=C3=B3rski?= Date: Fri, 28 Mar 2025 23:36:18 +0100 Subject: [PATCH 1/5] [clang][CodeGen] Added llvm ir pre-commit test. --- clang/test/CodeGen/atomic-ops-load.c | 11 +++ 1 file changed, 11 insertions(+) create mode 100644 clang/test/CodeGen/atomic-ops-load.c diff --git a/clang/test/CodeGen/atomic-ops-load.c b/clang/test/CodeGen/atomic-ops-load.c new file mode 100644 index 0..adcaf9a2112fa --- /dev/null +++ b/clang/test/CodeGen/atomic-ops-load.c @@ -0,0 +1,11 @@ +// RUN: %clang_cc1 -triple riscv64 -O1 -emit-llvm %s -o - | FileCheck %s +#include + +extern bool t1; +bool test1(void) { +// CHECK-LABEL: define{{.*}} i1 @test1 +// CHECK: load atomic i8, ptr @t1 monotonic, align 1 +// CHECK-NEXT: trunc i8 %{{.*}} to i1 +// CHECK-NEXT: ret i1 %{{.*}} + return __atomic_load_n(&t1, __ATOMIC_RELAXED); +} From 852b691fac487b3cef7b0df8875c26573bc58daa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20G=C3=B3rski?= Date: Sat, 29 Mar 2025 00:53:23 +0100 Subject: [PATCH 2/5] [clang][CodeGen] Added `!range` metadata to atomic load for `bool`. --- clang/lib/CodeGen/CGAtomic.cpp | 23 +++ clang/test/CodeGen/atomic-ops-load.c | 4 ++-- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/clang/lib/CodeGen/CGAtomic.cpp b/clang/lib/CodeGen/CGAtomic.cpp index 3adb2a7ad207f..70ae7180a9adc 100644 --- a/clang/lib/CodeGen/CGAtomic.cpp +++ b/clang/lib/CodeGen/CGAtomic.cpp @@ -590,6 +590,29 @@ static void EmitAtomicOp(CodeGenFunction &CGF, AtomicExpr *E, Address Dest, llvm::LoadInst *Load = CGF.Builder.CreateLoad(Ptr); Load->setAtomic(Order, Scope); Load->setVolatile(E->isVolatile()); + +if (CGF.CGM.getCodeGenOpts().OptimizationLevel == 0) { + CGF.Builder.CreateStore(Load, Dest); + return; +} + +QualType Ty = E->getValueType(); +if (!Ty->isBooleanType()) { + CGF.Builder.CreateStore(Load, Dest); + return; +} + +llvm::MDBuilder MDHelper(CGF.getLLVMContext()); +llvm::APInt BooleanMin = llvm::APInt(CGF.getContext().getTypeSize(Ty), 0); +llvm::APInt BooleanEnd = llvm::APInt(CGF.getContext().getTypeSize(Ty), 2); + +if (llvm::MDNode *RangeInfo = +MDHelper.createRange(BooleanMin, BooleanEnd)) { + Load->setMetadata(llvm::LLVMContext::MD_range, RangeInfo); + Load->setMetadata(llvm::LLVMContext::MD_noundef, + llvm::MDNode::get(CGF.getLLVMContext(), {})); +} + CGF.Builder.CreateStore(Load, Dest); return; } diff --git a/clang/test/CodeGen/atomic-ops-load.c b/clang/test/CodeGen/atomic-ops-load.c index adcaf9a2112fa..778a7ebdc2618 100644 --- a/clang/test/CodeGen/atomic-ops-load.c +++ b/clang/test/CodeGen/atomic-ops-load.c @@ -4,8 +4,8 @@ extern bool t1; bool test1(void) { // CHECK-LABEL: define{{.*}} i1 @test1 -// CHECK: load atomic i8, ptr @t1 monotonic, align 1 -// CHECK-NEXT: trunc i8 %{{.*}} to i1 +// CHECK: load atomic i8, ptr @t1 monotonic, align 1, !range ![[$WS_RANGE:[0-9]*]], !noundef !{{[0-9]+}} +// CHECK-NEXT: trunc nuw i8 %{{.*}} to i1 // CHECK-NEXT: ret i1 %{{.*}} return __atomic_load_n(&t1, __ATOMIC_RELAXED); } From e42772bbc0851696d73ded4abc3edf651f4e8b41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20G=C3=B3rski?= Date: Sat, 29 Mar 2025 01:12:18 +0100 Subject: [PATCH 3/5] Updated codestyle. --- clang/lib/CodeGen/CGAtomic.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/clang/lib/CodeGen/CGAtomic.cpp b/clang/lib/CodeGen/CGAtomic.cpp index 70ae7180a9adc..2c9613deef744 100644 --- a/clang/lib/CodeGen/CGAtomic.cpp +++ b/clang/lib/CodeGen/CGAtomic.cpp @@ -607,10 +607,10 @@ static void EmitAtomicOp(CodeGenFunction &CGF, AtomicExpr *E, Address Dest, llvm::APInt BooleanEnd = llvm::APInt(CGF.getContext().getTypeSize(Ty), 2); if (llvm::MDNode *RangeInfo = -MDHelper.createRange(BooleanMin, BooleanEnd)) { +MDHelper.createRange(BooleanMin, BooleanEnd)) { Load->setMetadata(llvm::LLVMContext::MD_range, RangeInfo); Load->setMetadata(llvm::LLVMContext::MD_noundef, - llvm::MDNode::get(CGF.getLLVMContext(), {})); +llvm::MDNode::get(CGF.getLLVMContext(), {})); } CGF.Builder.CreateStore(Load, Dest); From c95f16cf2df51e8f7a1d4952918c977104271072 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20G=C3=B3rski?= Date: Fri, 4 Apr 2025 11:20:30 +0200 Subject: [PATCH 4/5] Refactored early returns into normal if statement. --- clang/lib/CodeGen/CGAtomic.cpp | 29 ++--- 1 file changed, 10 insertions(+), 19 deletions(-) diff --git a/clang/lib/CodeGen/CGAtomic.cpp b/clang/lib/CodeGen/CGAtomic.cpp index 2c9613deef744..c40bf3cd77d86 100644 --- a/clang/lib/CodeGen/CGAtomic.cpp +++ b/clang/lib/CodeGen/CGAtomic.cpp @@ -591,26 +591,17 @@ static void EmitAtom
[clang] [clang][CodeGen] Add range metadata for atomic load of boolean type. #131476 (PR #133546)
https://github.com/janagor updated https://github.com/llvm/llvm-project/pull/133546 From 4581169d6fbe72357bb83b95fe36c8cc606efa1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20G=C3=B3rski?= Date: Fri, 28 Mar 2025 23:36:18 +0100 Subject: [PATCH 1/9] [clang][CodeGen] Added llvm ir pre-commit test. --- clang/test/CodeGen/atomic-ops-load.c | 11 +++ 1 file changed, 11 insertions(+) create mode 100644 clang/test/CodeGen/atomic-ops-load.c diff --git a/clang/test/CodeGen/atomic-ops-load.c b/clang/test/CodeGen/atomic-ops-load.c new file mode 100644 index 0..adcaf9a2112fa --- /dev/null +++ b/clang/test/CodeGen/atomic-ops-load.c @@ -0,0 +1,11 @@ +// RUN: %clang_cc1 -triple riscv64 -O1 -emit-llvm %s -o - | FileCheck %s +#include + +extern bool t1; +bool test1(void) { +// CHECK-LABEL: define{{.*}} i1 @test1 +// CHECK: load atomic i8, ptr @t1 monotonic, align 1 +// CHECK-NEXT: trunc i8 %{{.*}} to i1 +// CHECK-NEXT: ret i1 %{{.*}} + return __atomic_load_n(&t1, __ATOMIC_RELAXED); +} From 852b691fac487b3cef7b0df8875c26573bc58daa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20G=C3=B3rski?= Date: Sat, 29 Mar 2025 00:53:23 +0100 Subject: [PATCH 2/9] [clang][CodeGen] Added `!range` metadata to atomic load for `bool`. --- clang/lib/CodeGen/CGAtomic.cpp | 23 +++ clang/test/CodeGen/atomic-ops-load.c | 4 ++-- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/clang/lib/CodeGen/CGAtomic.cpp b/clang/lib/CodeGen/CGAtomic.cpp index 3adb2a7ad207f..70ae7180a9adc 100644 --- a/clang/lib/CodeGen/CGAtomic.cpp +++ b/clang/lib/CodeGen/CGAtomic.cpp @@ -590,6 +590,29 @@ static void EmitAtomicOp(CodeGenFunction &CGF, AtomicExpr *E, Address Dest, llvm::LoadInst *Load = CGF.Builder.CreateLoad(Ptr); Load->setAtomic(Order, Scope); Load->setVolatile(E->isVolatile()); + +if (CGF.CGM.getCodeGenOpts().OptimizationLevel == 0) { + CGF.Builder.CreateStore(Load, Dest); + return; +} + +QualType Ty = E->getValueType(); +if (!Ty->isBooleanType()) { + CGF.Builder.CreateStore(Load, Dest); + return; +} + +llvm::MDBuilder MDHelper(CGF.getLLVMContext()); +llvm::APInt BooleanMin = llvm::APInt(CGF.getContext().getTypeSize(Ty), 0); +llvm::APInt BooleanEnd = llvm::APInt(CGF.getContext().getTypeSize(Ty), 2); + +if (llvm::MDNode *RangeInfo = +MDHelper.createRange(BooleanMin, BooleanEnd)) { + Load->setMetadata(llvm::LLVMContext::MD_range, RangeInfo); + Load->setMetadata(llvm::LLVMContext::MD_noundef, + llvm::MDNode::get(CGF.getLLVMContext(), {})); +} + CGF.Builder.CreateStore(Load, Dest); return; } diff --git a/clang/test/CodeGen/atomic-ops-load.c b/clang/test/CodeGen/atomic-ops-load.c index adcaf9a2112fa..778a7ebdc2618 100644 --- a/clang/test/CodeGen/atomic-ops-load.c +++ b/clang/test/CodeGen/atomic-ops-load.c @@ -4,8 +4,8 @@ extern bool t1; bool test1(void) { // CHECK-LABEL: define{{.*}} i1 @test1 -// CHECK: load atomic i8, ptr @t1 monotonic, align 1 -// CHECK-NEXT: trunc i8 %{{.*}} to i1 +// CHECK: load atomic i8, ptr @t1 monotonic, align 1, !range ![[$WS_RANGE:[0-9]*]], !noundef !{{[0-9]+}} +// CHECK-NEXT: trunc nuw i8 %{{.*}} to i1 // CHECK-NEXT: ret i1 %{{.*}} return __atomic_load_n(&t1, __ATOMIC_RELAXED); } From e42772bbc0851696d73ded4abc3edf651f4e8b41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20G=C3=B3rski?= Date: Sat, 29 Mar 2025 01:12:18 +0100 Subject: [PATCH 3/9] Updated codestyle. --- clang/lib/CodeGen/CGAtomic.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/clang/lib/CodeGen/CGAtomic.cpp b/clang/lib/CodeGen/CGAtomic.cpp index 70ae7180a9adc..2c9613deef744 100644 --- a/clang/lib/CodeGen/CGAtomic.cpp +++ b/clang/lib/CodeGen/CGAtomic.cpp @@ -607,10 +607,10 @@ static void EmitAtomicOp(CodeGenFunction &CGF, AtomicExpr *E, Address Dest, llvm::APInt BooleanEnd = llvm::APInt(CGF.getContext().getTypeSize(Ty), 2); if (llvm::MDNode *RangeInfo = -MDHelper.createRange(BooleanMin, BooleanEnd)) { +MDHelper.createRange(BooleanMin, BooleanEnd)) { Load->setMetadata(llvm::LLVMContext::MD_range, RangeInfo); Load->setMetadata(llvm::LLVMContext::MD_noundef, - llvm::MDNode::get(CGF.getLLVMContext(), {})); +llvm::MDNode::get(CGF.getLLVMContext(), {})); } CGF.Builder.CreateStore(Load, Dest); From c95f16cf2df51e8f7a1d4952918c977104271072 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20G=C3=B3rski?= Date: Fri, 4 Apr 2025 11:20:30 +0200 Subject: [PATCH 4/9] Refactored early returns into normal if statement. --- clang/lib/CodeGen/CGAtomic.cpp | 29 ++--- 1 file changed, 10 insertions(+), 19 deletions(-) diff --git a/clang/lib/CodeGen/CGAtomic.cpp b/clang/lib/CodeGen/CGAtomic.cpp index 2c9613deef744..c40bf3cd77d86 100644 --- a/clang/lib/CodeGen/CGAtomic.cpp +++ b/clang/lib/CodeGen/CGAtomic.cpp @@ -591,26 +591,17 @@ static void EmitAtom
[clang] [clang][CodeGen] Add range metadata for atomic load of boolean type. #131476 (PR #133546)
janagor wrote: Oh, I see, I changed it. https://github.com/llvm/llvm-project/pull/133546 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] [clang][CodeGen] Add range metadata for atomic load of boolean type. #131476 (PR #133546)
janagor wrote: > I don't really understand what the new version of the patch is doing... > instcombine can infer `nuw` on `trunc` if the operand has range metadata. > There isn't any reason to duplicate that code. The unoptimized version of IR is which is generated is the following: ``` %atomic-temp = alloca i8, align 1 %0 = load atomic i8, ptr @t1 monotonic, align 1 store i8 %0, ptr %atomic-temp, align 1 %1 = load i8, ptr %atomic-temp, align 1 %loadedv = trunc i8 %1 to i1 ret i1 %loadedv ``` Lines 2-3 are generated by 'EmitAtomicOp' in CGAtomic, while `CodeGenFunction::EmitLoadOfScalar` adds `range!` only to line 4 when -O1. Lack of adding `range!` to 2nd line does not generate nuw at the end in trunc. From what I saw there were 2 ways to solve it: either add `nuw` the way I did it there, or add `range!` in EmitAtomicOp. I think in such case in order to no longer duplicate code would be to just make `getRangeForLoadFromType` a public method and use it for atomic load as well. https://github.com/llvm/llvm-project/pull/133546 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] [clang][CodeGen] Add range metadata for atomic load of boolean type. #131476 (PR #133546)
https://github.com/janagor updated https://github.com/llvm/llvm-project/pull/133546 From 4581169d6fbe72357bb83b95fe36c8cc606efa1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20G=C3=B3rski?= Date: Fri, 28 Mar 2025 23:36:18 +0100 Subject: [PATCH 1/8] [clang][CodeGen] Added llvm ir pre-commit test. --- clang/test/CodeGen/atomic-ops-load.c | 11 +++ 1 file changed, 11 insertions(+) create mode 100644 clang/test/CodeGen/atomic-ops-load.c diff --git a/clang/test/CodeGen/atomic-ops-load.c b/clang/test/CodeGen/atomic-ops-load.c new file mode 100644 index 0..adcaf9a2112fa --- /dev/null +++ b/clang/test/CodeGen/atomic-ops-load.c @@ -0,0 +1,11 @@ +// RUN: %clang_cc1 -triple riscv64 -O1 -emit-llvm %s -o - | FileCheck %s +#include + +extern bool t1; +bool test1(void) { +// CHECK-LABEL: define{{.*}} i1 @test1 +// CHECK: load atomic i8, ptr @t1 monotonic, align 1 +// CHECK-NEXT: trunc i8 %{{.*}} to i1 +// CHECK-NEXT: ret i1 %{{.*}} + return __atomic_load_n(&t1, __ATOMIC_RELAXED); +} From 852b691fac487b3cef7b0df8875c26573bc58daa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20G=C3=B3rski?= Date: Sat, 29 Mar 2025 00:53:23 +0100 Subject: [PATCH 2/8] [clang][CodeGen] Added `!range` metadata to atomic load for `bool`. --- clang/lib/CodeGen/CGAtomic.cpp | 23 +++ clang/test/CodeGen/atomic-ops-load.c | 4 ++-- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/clang/lib/CodeGen/CGAtomic.cpp b/clang/lib/CodeGen/CGAtomic.cpp index 3adb2a7ad207f..70ae7180a9adc 100644 --- a/clang/lib/CodeGen/CGAtomic.cpp +++ b/clang/lib/CodeGen/CGAtomic.cpp @@ -590,6 +590,29 @@ static void EmitAtomicOp(CodeGenFunction &CGF, AtomicExpr *E, Address Dest, llvm::LoadInst *Load = CGF.Builder.CreateLoad(Ptr); Load->setAtomic(Order, Scope); Load->setVolatile(E->isVolatile()); + +if (CGF.CGM.getCodeGenOpts().OptimizationLevel == 0) { + CGF.Builder.CreateStore(Load, Dest); + return; +} + +QualType Ty = E->getValueType(); +if (!Ty->isBooleanType()) { + CGF.Builder.CreateStore(Load, Dest); + return; +} + +llvm::MDBuilder MDHelper(CGF.getLLVMContext()); +llvm::APInt BooleanMin = llvm::APInt(CGF.getContext().getTypeSize(Ty), 0); +llvm::APInt BooleanEnd = llvm::APInt(CGF.getContext().getTypeSize(Ty), 2); + +if (llvm::MDNode *RangeInfo = +MDHelper.createRange(BooleanMin, BooleanEnd)) { + Load->setMetadata(llvm::LLVMContext::MD_range, RangeInfo); + Load->setMetadata(llvm::LLVMContext::MD_noundef, + llvm::MDNode::get(CGF.getLLVMContext(), {})); +} + CGF.Builder.CreateStore(Load, Dest); return; } diff --git a/clang/test/CodeGen/atomic-ops-load.c b/clang/test/CodeGen/atomic-ops-load.c index adcaf9a2112fa..778a7ebdc2618 100644 --- a/clang/test/CodeGen/atomic-ops-load.c +++ b/clang/test/CodeGen/atomic-ops-load.c @@ -4,8 +4,8 @@ extern bool t1; bool test1(void) { // CHECK-LABEL: define{{.*}} i1 @test1 -// CHECK: load atomic i8, ptr @t1 monotonic, align 1 -// CHECK-NEXT: trunc i8 %{{.*}} to i1 +// CHECK: load atomic i8, ptr @t1 monotonic, align 1, !range ![[$WS_RANGE:[0-9]*]], !noundef !{{[0-9]+}} +// CHECK-NEXT: trunc nuw i8 %{{.*}} to i1 // CHECK-NEXT: ret i1 %{{.*}} return __atomic_load_n(&t1, __ATOMIC_RELAXED); } From e42772bbc0851696d73ded4abc3edf651f4e8b41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20G=C3=B3rski?= Date: Sat, 29 Mar 2025 01:12:18 +0100 Subject: [PATCH 3/8] Updated codestyle. --- clang/lib/CodeGen/CGAtomic.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/clang/lib/CodeGen/CGAtomic.cpp b/clang/lib/CodeGen/CGAtomic.cpp index 70ae7180a9adc..2c9613deef744 100644 --- a/clang/lib/CodeGen/CGAtomic.cpp +++ b/clang/lib/CodeGen/CGAtomic.cpp @@ -607,10 +607,10 @@ static void EmitAtomicOp(CodeGenFunction &CGF, AtomicExpr *E, Address Dest, llvm::APInt BooleanEnd = llvm::APInt(CGF.getContext().getTypeSize(Ty), 2); if (llvm::MDNode *RangeInfo = -MDHelper.createRange(BooleanMin, BooleanEnd)) { +MDHelper.createRange(BooleanMin, BooleanEnd)) { Load->setMetadata(llvm::LLVMContext::MD_range, RangeInfo); Load->setMetadata(llvm::LLVMContext::MD_noundef, - llvm::MDNode::get(CGF.getLLVMContext(), {})); +llvm::MDNode::get(CGF.getLLVMContext(), {})); } CGF.Builder.CreateStore(Load, Dest); From c95f16cf2df51e8f7a1d4952918c977104271072 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20G=C3=B3rski?= Date: Fri, 4 Apr 2025 11:20:30 +0200 Subject: [PATCH 4/8] Refactored early returns into normal if statement. --- clang/lib/CodeGen/CGAtomic.cpp | 29 ++--- 1 file changed, 10 insertions(+), 19 deletions(-) diff --git a/clang/lib/CodeGen/CGAtomic.cpp b/clang/lib/CodeGen/CGAtomic.cpp index 2c9613deef744..c40bf3cd77d86 100644 --- a/clang/lib/CodeGen/CGAtomic.cpp +++ b/clang/lib/CodeGen/CGAtomic.cpp @@ -591,26 +591,17 @@ static void EmitAtom
[clang] [clang][CodeGen] Add range metadata for atomic load of boolean type. #131476 (PR #133546)
https://github.com/janagor edited https://github.com/llvm/llvm-project/pull/133546 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] Add range metadata for atomic load of boolean type. #131476 (PR #133546)
https://github.com/janagor created https://github.com/llvm/llvm-project/pull/133546 Addresses #131476. For `x86_64` it folds ``` movzbl t1(%rip), %eax andb$1, %al ``` into ``` movzbl t1(%rip), %eax ``` when run: `clang -S atomic-ops-load.c -o atomic-ops-load.s -O1 --target=x86_64`. But for riscv replaces: ``` lb a0, %lo(t1)(a0) andia0, a0, 1 ``` with ``` lb a0, %lo(t1)(a0) zext.b a0, a0 ``` when run: `when run `clang -S atomic-ops-load.c -o atomic-ops-load.s -O1 --target=riscv64`. From 4581169d6fbe72357bb83b95fe36c8cc606efa1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20G=C3=B3rski?= Date: Fri, 28 Mar 2025 23:36:18 +0100 Subject: [PATCH 1/3] [clang][CodeGen] Added llvm ir pre-commit test. --- clang/test/CodeGen/atomic-ops-load.c | 11 +++ 1 file changed, 11 insertions(+) create mode 100644 clang/test/CodeGen/atomic-ops-load.c diff --git a/clang/test/CodeGen/atomic-ops-load.c b/clang/test/CodeGen/atomic-ops-load.c new file mode 100644 index 0..adcaf9a2112fa --- /dev/null +++ b/clang/test/CodeGen/atomic-ops-load.c @@ -0,0 +1,11 @@ +// RUN: %clang_cc1 -triple riscv64 -O1 -emit-llvm %s -o - | FileCheck %s +#include + +extern bool t1; +bool test1(void) { +// CHECK-LABEL: define{{.*}} i1 @test1 +// CHECK: load atomic i8, ptr @t1 monotonic, align 1 +// CHECK-NEXT: trunc i8 %{{.*}} to i1 +// CHECK-NEXT: ret i1 %{{.*}} + return __atomic_load_n(&t1, __ATOMIC_RELAXED); +} From 852b691fac487b3cef7b0df8875c26573bc58daa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20G=C3=B3rski?= Date: Sat, 29 Mar 2025 00:53:23 +0100 Subject: [PATCH 2/3] [clang][CodeGen] Added `!range` metadata to atomic load for `bool`. --- clang/lib/CodeGen/CGAtomic.cpp | 23 +++ clang/test/CodeGen/atomic-ops-load.c | 4 ++-- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/clang/lib/CodeGen/CGAtomic.cpp b/clang/lib/CodeGen/CGAtomic.cpp index 3adb2a7ad207f..70ae7180a9adc 100644 --- a/clang/lib/CodeGen/CGAtomic.cpp +++ b/clang/lib/CodeGen/CGAtomic.cpp @@ -590,6 +590,29 @@ static void EmitAtomicOp(CodeGenFunction &CGF, AtomicExpr *E, Address Dest, llvm::LoadInst *Load = CGF.Builder.CreateLoad(Ptr); Load->setAtomic(Order, Scope); Load->setVolatile(E->isVolatile()); + +if (CGF.CGM.getCodeGenOpts().OptimizationLevel == 0) { + CGF.Builder.CreateStore(Load, Dest); + return; +} + +QualType Ty = E->getValueType(); +if (!Ty->isBooleanType()) { + CGF.Builder.CreateStore(Load, Dest); + return; +} + +llvm::MDBuilder MDHelper(CGF.getLLVMContext()); +llvm::APInt BooleanMin = llvm::APInt(CGF.getContext().getTypeSize(Ty), 0); +llvm::APInt BooleanEnd = llvm::APInt(CGF.getContext().getTypeSize(Ty), 2); + +if (llvm::MDNode *RangeInfo = +MDHelper.createRange(BooleanMin, BooleanEnd)) { + Load->setMetadata(llvm::LLVMContext::MD_range, RangeInfo); + Load->setMetadata(llvm::LLVMContext::MD_noundef, + llvm::MDNode::get(CGF.getLLVMContext(), {})); +} + CGF.Builder.CreateStore(Load, Dest); return; } diff --git a/clang/test/CodeGen/atomic-ops-load.c b/clang/test/CodeGen/atomic-ops-load.c index adcaf9a2112fa..778a7ebdc2618 100644 --- a/clang/test/CodeGen/atomic-ops-load.c +++ b/clang/test/CodeGen/atomic-ops-load.c @@ -4,8 +4,8 @@ extern bool t1; bool test1(void) { // CHECK-LABEL: define{{.*}} i1 @test1 -// CHECK: load atomic i8, ptr @t1 monotonic, align 1 -// CHECK-NEXT: trunc i8 %{{.*}} to i1 +// CHECK: load atomic i8, ptr @t1 monotonic, align 1, !range ![[$WS_RANGE:[0-9]*]], !noundef !{{[0-9]+}} +// CHECK-NEXT: trunc nuw i8 %{{.*}} to i1 // CHECK-NEXT: ret i1 %{{.*}} return __atomic_load_n(&t1, __ATOMIC_RELAXED); } From e42772bbc0851696d73ded4abc3edf651f4e8b41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20G=C3=B3rski?= Date: Sat, 29 Mar 2025 01:12:18 +0100 Subject: [PATCH 3/3] Updated codestyle. --- clang/lib/CodeGen/CGAtomic.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/clang/lib/CodeGen/CGAtomic.cpp b/clang/lib/CodeGen/CGAtomic.cpp index 70ae7180a9adc..2c9613deef744 100644 --- a/clang/lib/CodeGen/CGAtomic.cpp +++ b/clang/lib/CodeGen/CGAtomic.cpp @@ -607,10 +607,10 @@ static void EmitAtomicOp(CodeGenFunction &CGF, AtomicExpr *E, Address Dest, llvm::APInt BooleanEnd = llvm::APInt(CGF.getContext().getTypeSize(Ty), 2); if (llvm::MDNode *RangeInfo = -MDHelper.createRange(BooleanMin, BooleanEnd)) { +MDHelper.createRange(BooleanMin, BooleanEnd)) { Load->setMetadata(llvm::LLVMContext::MD_range, RangeInfo); Load->setMetadata(llvm::LLVMContext::MD_noundef, - llvm::MDNode::get(CGF.getLLVMContext(), {})); +llvm::MDNode::get(CGF.getLLVMContext(), {})); } CGF.Builder.CreateStore(Load, Dest); ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listin
[clang] Add range metadata for atomic load of boolean type. #131476 (PR #133546)
https://github.com/janagor edited https://github.com/llvm/llvm-project/pull/133546 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] [llvm] [RISC-V] extra andi instruction when loading a bool atomically #131476 (PR #133406)
janagor wrote: Ahh, I see, thanks for info. I will close this this PR and split into two different PR's. https://github.com/llvm/llvm-project/pull/133406 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] [llvm] [RISC-V] extra andi instruction when loading a bool atomically #131476 (PR #133406)
https://github.com/janagor closed https://github.com/llvm/llvm-project/pull/133406 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] [llvm] [RISC-V] extra andi instruction when loading a bool atomically #131476 (PR #133406)
https://github.com/janagor created https://github.com/llvm/llvm-project/pull/133406 Fixes #131476 In `EmitAtomicOp` for `AtomicLoad` case added ` !range` metadata when encountered boolean type. This results in in generation `trunc nuw` instruction instead of `trunc`. In `RISCVTargetLowering::RISCVTargetLowering` made extending of atomic loads legal. From 31527cdc70544e87059fab25e260f14063efd10c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20G=C3=B3rski?= Date: Wed, 26 Mar 2025 22:29:32 +0100 Subject: [PATCH 1/5] [CodeGen] Added llvm ir pre-commit test. --- clang/test/CodeGen/atomic-ops-load.c | 11 +++ 1 file changed, 11 insertions(+) create mode 100644 clang/test/CodeGen/atomic-ops-load.c diff --git a/clang/test/CodeGen/atomic-ops-load.c b/clang/test/CodeGen/atomic-ops-load.c new file mode 100644 index 0..adcaf9a2112fa --- /dev/null +++ b/clang/test/CodeGen/atomic-ops-load.c @@ -0,0 +1,11 @@ +// RUN: %clang_cc1 -triple riscv64 -O1 -emit-llvm %s -o - | FileCheck %s +#include + +extern bool t1; +bool test1(void) { +// CHECK-LABEL: define{{.*}} i1 @test1 +// CHECK: load atomic i8, ptr @t1 monotonic, align 1 +// CHECK-NEXT: trunc i8 %{{.*}} to i1 +// CHECK-NEXT: ret i1 %{{.*}} + return __atomic_load_n(&t1, __ATOMIC_RELAXED); +} From 47320ed37deb366c82f2f7cfb5df8418f3433b5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20G=C3=B3rski?= Date: Thu, 27 Mar 2025 12:14:59 +0100 Subject: [PATCH 2/5] [CodeGen] Added `!range` metadata to atomic load for `bool` resulting in including `nuw` for the `trunc`. --- clang/lib/CodeGen/CGAtomic.cpp | 23 +++ clang/test/CodeGen/atomic-ops-load.c | 4 ++-- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/clang/lib/CodeGen/CGAtomic.cpp b/clang/lib/CodeGen/CGAtomic.cpp index 3adb2a7ad207f..70ae7180a9adc 100644 --- a/clang/lib/CodeGen/CGAtomic.cpp +++ b/clang/lib/CodeGen/CGAtomic.cpp @@ -590,6 +590,29 @@ static void EmitAtomicOp(CodeGenFunction &CGF, AtomicExpr *E, Address Dest, llvm::LoadInst *Load = CGF.Builder.CreateLoad(Ptr); Load->setAtomic(Order, Scope); Load->setVolatile(E->isVolatile()); + +if (CGF.CGM.getCodeGenOpts().OptimizationLevel == 0) { + CGF.Builder.CreateStore(Load, Dest); + return; +} + +QualType Ty = E->getValueType(); +if (!Ty->isBooleanType()) { + CGF.Builder.CreateStore(Load, Dest); + return; +} + +llvm::MDBuilder MDHelper(CGF.getLLVMContext()); +llvm::APInt BooleanMin = llvm::APInt(CGF.getContext().getTypeSize(Ty), 0); +llvm::APInt BooleanEnd = llvm::APInt(CGF.getContext().getTypeSize(Ty), 2); + +if (llvm::MDNode *RangeInfo = +MDHelper.createRange(BooleanMin, BooleanEnd)) { + Load->setMetadata(llvm::LLVMContext::MD_range, RangeInfo); + Load->setMetadata(llvm::LLVMContext::MD_noundef, + llvm::MDNode::get(CGF.getLLVMContext(), {})); +} + CGF.Builder.CreateStore(Load, Dest); return; } diff --git a/clang/test/CodeGen/atomic-ops-load.c b/clang/test/CodeGen/atomic-ops-load.c index adcaf9a2112fa..778a7ebdc2618 100644 --- a/clang/test/CodeGen/atomic-ops-load.c +++ b/clang/test/CodeGen/atomic-ops-load.c @@ -4,8 +4,8 @@ extern bool t1; bool test1(void) { // CHECK-LABEL: define{{.*}} i1 @test1 -// CHECK: load atomic i8, ptr @t1 monotonic, align 1 -// CHECK-NEXT: trunc i8 %{{.*}} to i1 +// CHECK: load atomic i8, ptr @t1 monotonic, align 1, !range ![[$WS_RANGE:[0-9]*]], !noundef !{{[0-9]+}} +// CHECK-NEXT: trunc nuw i8 %{{.*}} to i1 // CHECK-NEXT: ret i1 %{{.*}} return __atomic_load_n(&t1, __ATOMIC_RELAXED); } From 1aebc80d0053a5393c467c68a6671584e52d2a06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20G=C3=B3rski?= Date: Thu, 27 Mar 2025 14:19:32 +0100 Subject: [PATCH 3/5] [RISCV] Added pre-commit tests. --- llvm/test/CodeGen/RISCV/atomic-load-zext.ll | 1386 +++ 1 file changed, 1386 insertions(+) create mode 100644 llvm/test/CodeGen/RISCV/atomic-load-zext.ll diff --git a/llvm/test/CodeGen/RISCV/atomic-load-zext.ll b/llvm/test/CodeGen/RISCV/atomic-load-zext.ll new file mode 100644 index 0..252b6bc32b3ff --- /dev/null +++ b/llvm/test/CodeGen/RISCV/atomic-load-zext.ll @@ -0,0 +1,1386 @@ +; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py +; RUN: llc -mtriple=riscv32 -verify-machineinstrs < %s \ +; RUN: | FileCheck -check-prefix=RV32I %s +; RUN: llc -mtriple=riscv32 -mattr=+a,+no-trailing-seq-cst-fence -verify-machineinstrs < %s \ +; RUN: | FileCheck -check-prefixes=RV32IA,RV32IA-WMO %s +; RUN: llc -mtriple=riscv32 -mattr=+a,+ztso,+no-trailing-seq-cst-fence -verify-machineinstrs < %s \ +; RUN: | FileCheck -check-prefixes=RV32IA,RV32IA-TSO %s +; RUN: llc -mtriple=riscv64 -verify-machineinstrs < %s \ +; RUN: | FileCheck -check-prefix=RV64I %s +; RUN: llc -mtriple=riscv64 -mattr=+a,+no-trailing-seq-cst-fence -verify-machineinstrs < %s \ +; RUN: | FileCheck -check-prefixes=RV64IA,RV64IA-WMO %s +; RU