pan/bit: Link standalone compiler with en/decoder

We would like to submit jobs from the standalone compiler for testing
purposes, so let's get things wired up.

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4382>

diff --git a/src/panfrost/bifrost/test/bi_submit.c b/src/panfrost/bifrost/test/bi_submit.c
new file mode 100644 (file)
index 0000000..fcc4459
--- /dev/null
+++ b/src/panfrost/bifrost/test/bi_submit.c
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2020 Collabora Ltd.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Authors (Collabora):
+ *      Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
+ */
+
+#include "bit.h"
+#include "panfrost/pandecode/decode.h"
+
+/* Standalone compiler tests submitting jobs directly to the hardware. Uses the
+ * `bit` prefix for `BIfrost Tests` and because bit sounds wicked cool. */
+
+static struct panfrost_bo *
+bit_bo_create(struct panfrost_device *dev, size_t size)
+{
+        struct panfrost_bo *bo = panfrost_bo_create(dev, size, PAN_BO_EXECUTE);
+        pandecode_inject_mmap(bo->gpu, bo->cpu, bo->size, NULL);
+        return bo;
+}

diff --git a/src/panfrost/bifrost/test/bit.h b/src/panfrost/bifrost/test/bit.h
new file mode 100644 (file)
index 0000000..d5751f8
--- /dev/null
+++ b/src/panfrost/bifrost/test/bit.h
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2020 Collabora Ltd.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Authors (Collabora):
+ *      Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
+ */
+
+#ifndef __BIFROST_TEST_H
+#define __BIFROST_TEST_H
+
+#include "panfrost/include/panfrost-job.h"
+#include "panfrost/encoder/pan_device.h"
+#include "panfrost/encoder/pan_bo.h"
+
+#endif
+
+

diff --git a/src/panfrost/meson.build b/src/panfrost/meson.build
index 41a5ade5725a4d3f5e8aa907e233532806ac9c36..e94a3341fb06b8b8db62bdc7d6d7c250f378e631 100644 (file)
--- a/src/panfrost/meson.build
+++ b/src/panfrost/meson.build
@@ -36,6 +36,7 @@ subdir('encoder')
 
 files_bifrost = files(
   'bifrost/cmdline.c',
+  'bifrost/test/bi_submit.c'
 )
 
 bifrost_compiler = executable(
@@ -49,14 +50,18 @@ bifrost_compiler = executable(
     inc_include,
     inc_src,
     inc_panfrost,
+    inc_panfrost_hw,
  ],
   dependencies : [
     idep_nir,
     idep_mesautil,
+    dep_libdrm,
   ],
   link_with : [
     libglsl_standalone,
-    libpanfrost_bifrost
+    libpanfrost_bifrost,
+    libpanfrost_decode,
+    libpanfrost_encoder,
   ],
   build_by_default : true
 )