Add more FieldPacker.add() routines.
This cl also improves the cppbasic test by checking results for known functions.
Bug: 5972398
Change-Id: Iacd9eb42e57ace952c590f8a988708f01bb53d59
diff --git a/tests/cppbasic/compute.cpp b/tests/cppbasic/compute.cpp
index 471b10a..d1647c4 100644
--- a/tests/cppbasic/compute.cpp
+++ b/tests/cppbasic/compute.cpp
@@ -35,15 +35,62 @@
sp<ScriptC_mono> sc = new ScriptC_mono(rs, NULL, 0);
printf("new script\n");
+ // We read back the status from the script-side via a "failed" allocation.
+ sp<const Element> failed_e = Element::BOOLEAN(rs);
+ Type::Builder failed_tb(rs, failed_e);
+ failed_tb.setX(1);
+ sp<const Type> failed_t = failed_tb.create();
+ sp<Allocation> failed_alloc = Allocation::createTyped(rs, failed_t);
+ bool failed = false;
+ failed_alloc->copy1DRangeFrom(0, failed_t->getCount(), &failed);
+ sc->bind_failed(failed_alloc);
+
uint32_t *buf = new uint32_t[t->getCount()];
for (uint32_t ct=0; ct < t->getCount(); ct++) {
buf[ct] = ct | (ct << 16);
}
ain->copy1DRangeFrom(0, t->getCount(), buf);
+ delete [] buf;
sc->forEach_root(ain, aout);
+
+ sc->invoke_foo(99, 3.1f);
+ sc->set_g_f(39.9f);
+ sc->set_g_i(-14);
+ sc->invoke_foo(99, 3.1f);
printf("for each done\n");
+ sc->invoke_bar(47, -3, 'c', -7, 14, -8);
+
+ // Verify a simple kernel.
+ {
+ sp<const Element> e = Element::I32(rs);
+ Type::Builder tb(rs, e);
+ tb.setX(5);
+ tb.setY(5);
+ sp<const Type> t = tb.create();
+ sp<Allocation> kern1_in = Allocation::createTyped(rs, t);
+ sp<Allocation> kern1_out = Allocation::createTyped(rs, t);
+
+ int *buf = new int[t->getCount()];
+ for (uint32_t ct=0; ct < t->getCount(); ct++) {
+ buf[ct] = 0;
+ }
+ kern1_in->copy1DFrom(buf);
+ delete [] buf;
+
+ sc->forEach_kern1(kern1_in, kern1_out);
+ sc->forEach_verify_kern1(kern1_out);
+
+ rs->finish();
+ failed_alloc->copy1DTo(&failed);
+
+ e.clear();
+ t.clear();
+ kern1_in.clear();
+ kern1_out.clear();
+ }
+
printf("Deleting stuff\n");
sc.clear();
t.clear();
@@ -53,4 +100,12 @@
aout.clear();
// delete rs;
printf("Delete OK\n");
+
+ if (failed) {
+ printf("TEST FAILED!\n");
+ } else {
+ printf("TEST PASSED!\n");
+ }
+
+ return failed;
}