From caae56d32ccd2a90afe7afe431e0157377612105 Mon Sep 17 00:00:00 2001
From: Sven van Haastregt <sven.vanhaastregt@arm.com>
Date: Wed, 15 May 2019 19:02:06 +0100
Subject: [PATCH] cl21: Add image access qualifier for spirv_new binaries
 (#272)

The OpenCL SPIR-V Environment Specification v2.2-10, Section 2.1
states that:

    For all OpTypeImage type-declaration instructions:
    The optional image Access Qualifier must be present.

Add the ReadOnly or WriteOnly qualifier as appropriate to the .spvasm
files, and regenerate the .spv files using

    spirv-as --target-env spv1.0
---
 .../spirv_bin/decorate_nonreadable.spv32      | Bin 1116 -> 1120 bytes
 .../spirv_bin/decorate_nonreadable.spv64      | Bin 1328 -> 1332 bytes
 .../spirv_bin/decorate_nonwritable.spv32      | Bin 1372 -> 1376 bytes
 .../spirv_bin/decorate_nonwritable.spv64      | Bin 1584 -> 1588 bytes
 .../spirv_txt/decorate_nonreadable.spvasm32   |   2 +-
 .../spirv_txt/decorate_nonreadable.spvasm64   |   2 +-
 .../spirv_txt/decorate_nonwritable.spvasm32   |   2 +-
 .../spirv_txt/decorate_nonwritable.spvasm64   |   2 +-
 8 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/test_conformance/spirv_new/spirv_bin/decorate_nonreadable.spv32 b/test_conformance/spirv_new/spirv_bin/decorate_nonreadable.spv32
index 085ef6c7d0ded9919929e41615cec156d42b3df5..fae2ef6bda1c5d59c49a4d42fcc59d265daaba18 100644
GIT binary patch
delta 20
ccmcb^@qlAP851Md<Z>oOM#jxknT|6807x|kK>z>%

delta 18
acmaFBaff3=851Mt<Z>p(&2yNJFaiKS;s!zh

diff --git a/test_conformance/spirv_new/spirv_bin/decorate_nonreadable.spv64 b/test_conformance/spirv_new/spirv_bin/decorate_nonreadable.spv64
index 22f70a14ddc38f553f1c3ee6fe11875280d00f58..adbca68bdf756f0e9981fe87a7ff18133588f2a6 100644
GIT binary patch
delta 34
ocmdnMwS{ZLCnjz#1{nqh25BH>oXp59JXwI5g^_WyAhSFZ0DQOwr~m)}

delta 32
mcmdnOwSjBHCnj!A1{nqh25BH>oXp59JXwI5WwQjc3=;rzH3g{v

diff --git a/test_conformance/spirv_new/spirv_bin/decorate_nonwritable.spv32 b/test_conformance/spirv_new/spirv_bin/decorate_nonwritable.spv32
index af3bb37ee91c7ddccfffbe91da1129c1bc4cee52..1b6ea152355951d8568a8bab1713d32a1e4d8060 100644
GIT binary patch
delta 18
Zcmcb^^?+-G95W-=WO-)A%{I&mOaL}J1eX8+

delta 18
ZcmaFBb%$$%95W;5WO-)A%`VI`OaL}f1eyQ<

diff --git a/test_conformance/spirv_new/spirv_bin/decorate_nonwritable.spv64 b/test_conformance/spirv_new/spirv_bin/decorate_nonwritable.spv64
index 7559d52da6eebd0b923eb5dddc538156bfee5c37..a9ff218c0025f4921dc4394ec7bee4f93e0fbd6e 100644
GIT binary patch
delta 18
acmdnMvxR5FEM`Wo$+MXiH}7DsU;+R=Zw3zl

delta 18
acmdnOvw>&BEM`W|$+MXiHy>awVFCa>g$5D;

diff --git a/test_conformance/spirv_new/spirv_txt/decorate_nonreadable.spvasm32 b/test_conformance/spirv_new/spirv_txt/decorate_nonreadable.spvasm32
index 79cb9def..8cc21d31 100644
--- a/test_conformance/spirv_new/spirv_txt/decorate_nonreadable.spvasm32
+++ b/test_conformance/spirv_new/spirv_txt/decorate_nonreadable.spvasm32
@@ -32,7 +32,7 @@
  %3 = OpTypeVector %2 3
  %4 = OpTypePointer UniformConstant %3
  %7 = OpTypeVoid
- %8 = OpTypeImage %7 2D 0 0 0 0 Unknown
+ %8 = OpTypeImage %7 2D 0 0 0 0 Unknown WriteOnly
  %9 = OpTypeVector %2 4
 %10 = OpTypePointer CrossWorkgroup %9
 %11 = OpTypeFunction %7 %8 %10
diff --git a/test_conformance/spirv_new/spirv_txt/decorate_nonreadable.spvasm64 b/test_conformance/spirv_new/spirv_txt/decorate_nonreadable.spvasm64
index 6659560a..71b2a26b 100644
--- a/test_conformance/spirv_new/spirv_txt/decorate_nonreadable.spvasm64
+++ b/test_conformance/spirv_new/spirv_txt/decorate_nonreadable.spvasm64
@@ -40,7 +40,7 @@
  %3 = OpTypeVector %2 3
  %4 = OpTypePointer UniformConstant %3
  %7 = OpTypeVoid
- %8 = OpTypeImage %7 2D 0 0 0 0 Unknown
+ %8 = OpTypeImage %7 2D 0 0 0 0 Unknown WriteOnly
 %10 = OpTypeVector %9 4
 %11 = OpTypePointer CrossWorkgroup %10
 %12 = OpTypeFunction %7 %8 %11
diff --git a/test_conformance/spirv_new/spirv_txt/decorate_nonwritable.spvasm32 b/test_conformance/spirv_new/spirv_txt/decorate_nonwritable.spvasm32
index ef908f43..b7ae2793 100644
--- a/test_conformance/spirv_new/spirv_txt/decorate_nonwritable.spvasm32
+++ b/test_conformance/spirv_new/spirv_txt/decorate_nonwritable.spvasm32
@@ -41,7 +41,7 @@
 %10 = OpTypeVoid
 %11 = OpTypeVector %2 4
 %12 = OpTypePointer CrossWorkgroup %11
-%13 = OpTypeImage %10 2D 0 0 0 0 Unknown
+%13 = OpTypeImage %10 2D 0 0 0 0 Unknown ReadOnly
 %14 = OpTypeFunction %10 %12 %13
 %27 = OpTypeVector %2 2
 %31 = OpTypeSampler
diff --git a/test_conformance/spirv_new/spirv_txt/decorate_nonwritable.spvasm64 b/test_conformance/spirv_new/spirv_txt/decorate_nonwritable.spvasm64
index f8e6af95..fca00d84 100644
--- a/test_conformance/spirv_new/spirv_txt/decorate_nonwritable.spvasm64
+++ b/test_conformance/spirv_new/spirv_txt/decorate_nonwritable.spvasm64
@@ -49,7 +49,7 @@
 %11 = OpTypeVoid
 %12 = OpTypeVector %2 4
 %13 = OpTypePointer CrossWorkgroup %12
-%14 = OpTypeImage %11 2D 0 0 0 0 Unknown
+%14 = OpTypeImage %11 2D 0 0 0 0 Unknown ReadOnly
 %15 = OpTypeFunction %11 %13 %14
 %31 = OpTypeVector %2 2
 %35 = OpTypeSampler