Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Flang2] Fix duplicate TBAA type systems across modules #1460

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions test/llvm_ir_correct/tbaa_multimod_01_callee.f90
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
! A part of the test provided in tbaa_multimod_01_caller.f90
! Empty RUN and CHECK to prevent error
! RUN: echo "NoCheck" | FileCheck %s
! CHECK: NoCheck
subroutine modify1(arr)
implicit none
real, intent(inout) :: arr(:)
arr(0) = arr(0) + 0.5
end subroutine modify1

subroutine modify2(arr)
implicit none
real, intent(inout) :: arr(:)
arr(2) = arr(2) + 1.5
end subroutine modify2

subroutine printout(arr)
implicit none
real, intent(in) :: arr(:)
integer :: i
do i = 1, size(arr)
print arr(i), " "
enddo
end subroutine printout
18 changes: 18 additions & 0 deletions test/llvm_ir_correct/tbaa_multimod_01_caller.f90
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
! This test contians two files, tbaa_multimod_01_caller.f90 and tbaa_multimod_01_callee.f90
! RUN: %flang -Wl,-mllvm,-aa-trace -fuse-ld=llvm-lto -flto=full -O3 %s %S/tbaa_multimod_01_callee.f90 -o - 2>&1 1>- | FileCheck %s
! CHECK: End ptr getelementptr (%struct.BSS1, ptr @.BSS1, i64 -1, i32 0, i64 16) @ LocationSize::precise(16), ptr inttoptr (i64 56 to ptr) @ LocationSize::precise(8) = MayAlias

program main
implicit none
integer, parameter :: n = 5
real :: arr(n)
integer :: i
i = 0
arr = 3.2
arr(i) = 4
call modify1(arr)
call modify2(arr)

arr(i) = arr(i) + 2.5
call printout(arr)
end program main
12 changes: 12 additions & 0 deletions test/llvm_ir_correct/tbaa_multimod_02_callee.f90
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
! A part of the test provided in tbaa_multimod_02_caller.f90
! Empty RUN and CHECK to prevent error
! RUN: echo "NoCheck" | FileCheck %s
! CHECK: NoCheck
subroutine to_load(arr)
implicit none
real, intent(inout) :: arr(:)
real :: var
var = arr(0)
var = var * 2
print var
end subroutine to_load
14 changes: 14 additions & 0 deletions test/llvm_ir_correct/tbaa_multimod_02_caller.f90
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
! This test contians two files, tbaa_multimod_02_caller.f90 and tbaa_multimod_02_callee.f90
! RUN: %flang -Wl,-mllvm,-aa-trace -fuse-ld=llvm-lto -flto=full -O3 %s %S/tbaa_multimod_02_callee.f90 -o - 2>&1 1>- | FileCheck %s
! CHECK: End ptr getelementptr inbounds (%struct.BSS1, ptr @.BSS1, i64 0, i32 0, i64 16) @ LocationSize::precise(4), ptr inttoptr (i64 56 to ptr) @ LocationSize::precise(8) = MayAlias

program main
implicit none
integer, parameter :: n = 5
real :: arr(n)
integer :: i
arr = 1
call to_load(arr)
arr(0) = 4
call to_load(arr)
end program main
10 changes: 6 additions & 4 deletions tools/flang2/flang2exe/cgmain.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@
#include "ll_ftn.h"
#include "exp_rte.h"
#include "error.h"
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <string>
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All standard headers should be included before custom headers (I apologize if I wasn't clear). And please sort these alphabetically.

#include "machreg.h"
#include "dinit.h"
#include "cg.h"
Expand All @@ -25,9 +29,6 @@
#include "lldebug.h"
#include "go.h"
#include "sharedefs.h"
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include "llassem.h"
#include "ll_write.h"
#include "expand.h"
Expand Down Expand Up @@ -2643,7 +2644,8 @@ get_omnipotent_pointer(LL_Module *module)
const char *baseName = "Flang FAA";
const char *const omniName = "unlimited ptr";
const char *const unObjName = "unref ptr";
snprintf(baseBuff, 32, "%s %x", baseName, funcId);
snprintf(baseBuff, 32, "%s %zx %x", baseName,
std::hash<std::string>{}(current_module->module_name), funcId);
s0 = ll_get_md_string(module, baseBuff);
r0 = ll_get_md_node(module, LL_PlainMDNode, &s0, 1);
a[0] = ll_get_md_string(module, unObjName);
Expand Down
Loading