<div dir="ltr">Hello Samuel,<br><br><div>This commit broke tests on few of our builders:</div><div><br></div><a href="http://lab.llvm.org:8011/builders/clang-with-thin-lto-ubuntu/builds/12172">http://lab.llvm.org:8011/builders/clang-with-thin-lto-ubuntu/builds/12172</a><br><a href="http://lab.llvm.org:8011/builders/clang-with-thin-lto-ubuntu">http://lab.llvm.org:8011/builders/clang-with-thin-lto-ubuntu</a><br><a href="http://lab.llvm.org:8011/builders/clang-lld-x86_64-2stage">http://lab.llvm.org:8011/builders/clang-lld-x86_64-2stage</a><br><br>. . .<br>Failing Tests (2):<br> . . .<br>    LLVM :: CodeGen/AMDGPU/amdgpu-alias-analysis.ll<br><br>Please have a look?<br>The builder was already red and did not sent any notifications on this.<br><br>Thanks<br><br>Galina<br></div><div class="gmail_extra"><br><div class="gmail_quote">On Mon, Aug 20, 2018 at 6:18 AM, Samuel Pitoiset via llvm-commits <span dir="ltr"><<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: hakzsam<br>
Date: Mon Aug 20 06:18:59 2018<br>
New Revision: 340171<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=340171&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project?rev=340171&view=rev</a><br>
Log:<br>
AMDGPU: bump AS.MAX_COMMON_ADDRESS to 6 since 32-bit addr space<br>
<br>
32-bit constant address space is declared as 6, so the<br>
maximum number of address spaces is 6, not 5.<br>
<br>
Fixes "LLVM ERROR: Pointer address space out of range".<br>
<br>
v3: use static_assert()<br>
v2: add a very simple test for 32-bit addr space<br>
<br>
Bugzilla: <a href="https://bugs.freedesktop.org/show_bug.cgi?id=106630" rel="noreferrer" target="_blank">https://bugs.freedesktop.org/<wbr>show_bug.cgi?id=106630</a><br>
Signed-off-by: Samuel Pitoiset <<a href="mailto:samuel.pitoiset@gmail.com">samuel.pitoiset@gmail.com</a>><br>
<br>
Modified:<br>
    llvm/trunk/lib/Target/AMDGPU/<wbr>AMDGPU.h<br>
    llvm/trunk/lib/Target/AMDGPU/<wbr>AMDGPUAliasAnalysis.cpp<br>
    llvm/trunk/test/CodeGen/<wbr>AMDGPU/amdgpu-alias-analysis.<wbr>ll<br>
<br>
Modified: llvm/trunk/lib/Target/AMDGPU/<wbr>AMDGPU.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/AMDGPU/AMDGPU.h?rev=340171&r1=340170&r2=340171&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/llvm/trunk/lib/Target/<wbr>AMDGPU/AMDGPU.h?rev=340171&r1=<wbr>340170&r2=340171&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- llvm/trunk/lib/Target/AMDGPU/<wbr>AMDGPU.h (original)<br>
+++ llvm/trunk/lib/Target/AMDGPU/<wbr>AMDGPU.h Mon Aug 20 06:18:59 2018<br>
@@ -229,7 +229,7 @@ struct AMDGPUAS {<br>
<br>
   enum : unsigned {<br>
     // The maximum value for flat, generic, local, private, constant and region.<br>
-    MAX_COMMON_ADDRESS = 5,<br>
+    MAX_COMMON_ADDRESS = 6,<br>
<br>
     GLOBAL_ADDRESS = 1,   ///< Address space for global memory (RAT0, VTX0).<br>
     CONSTANT_ADDRESS = 4, ///< Address space for constant memory (VTX2)<br>
<br>
Modified: llvm/trunk/lib/Target/AMDGPU/<wbr>AMDGPUAliasAnalysis.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/AMDGPU/AMDGPUAliasAnalysis.cpp?rev=340171&r1=340170&r2=340171&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/llvm/trunk/lib/Target/<wbr>AMDGPU/AMDGPUAliasAnalysis.<wbr>cpp?rev=340171&r1=340170&r2=<wbr>340171&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- llvm/trunk/lib/Target/AMDGPU/<wbr>AMDGPUAliasAnalysis.cpp (original)<br>
+++ llvm/trunk/lib/Target/AMDGPU/<wbr>AMDGPUAliasAnalysis.cpp Mon Aug 20 06:18:59 2018<br>
@@ -69,7 +69,7 @@ AMDGPUAAResult::<wbr>ASAliasRulesTy::ASAliasR<br>
   /* Region   */ {MayAlias, NoAlias , NoAlias , NoAlias,  MayAlias, NoAlias},<br>
   /* Private  */ {MayAlias, NoAlias , NoAlias , NoAlias , NoAlias , MayAlias}<br>
   };<br>
-  assert(AS.MAX_COMMON_ADDRESS <= 5);<br>
+  static_assert(AS.MAX_COMMON_<wbr>ADDRESS <= 6, "Addr space out of range");<br>
   if (AS.FLAT_ADDRESS == 0) {<br>
     assert(AS.GLOBAL_ADDRESS   == 1 &&<br>
            AS.REGION_ADDRESS   == 2 &&<br>
<br>
Modified: llvm/trunk/test/CodeGen/<wbr>AMDGPU/amdgpu-alias-analysis.<wbr>ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/AMDGPU/amdgpu-alias-analysis.ll?rev=340171&r1=340170&r2=340171&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/llvm/trunk/test/<wbr>CodeGen/AMDGPU/amdgpu-alias-<wbr>analysis.ll?rev=340171&r1=<wbr>340170&r2=340171&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- llvm/trunk/test/CodeGen/<wbr>AMDGPU/amdgpu-alias-analysis.<wbr>ll (original)<br>
+++ llvm/trunk/test/CodeGen/<wbr>AMDGPU/amdgpu-alias-analysis.<wbr>ll Mon Aug 20 06:18:59 2018<br>
@@ -7,3 +7,9 @@ define void @test(i8 addrspace(5)* %p, i<br>
   ret void<br>
 }<br>
<br>
+; CHECK: NoAlias:      i8 addrspace(1)* %p1, i8 addrspace(6)* %p<br>
+<br>
+define void @test_32bit_addr_space(i8 addrspace(6)* %p, i8 addrspace(1)* %p1) {<br>
+  ret void<br>
+}<br>
+<br>
<br>
<br>
______________________________<wbr>_________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/<wbr>mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div>