From 8e6ac35658848ea97bbaee466f2b8e6800981363 Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Thu, 16 Mar 2023 07:51:57 +0000 Subject: [PATCH] asahi: fix a few typos Part-of: --- src/asahi/compiler/agx_compile.c | 4 ++-- src/asahi/compiler/agx_opcodes.py | 2 +- src/asahi/compiler/agx_opt_cse.c | 2 +- src/asahi/lib/agx_nir_lower_tilebuffer.c | 4 ++-- src/asahi/lib/cmdbuf.xml | 2 +- src/asahi/lib/decode.c | 10 +++++----- src/asahi/lib/pool.c | 2 +- src/gallium/drivers/asahi/agx_state.c | 4 ++-- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/asahi/compiler/agx_compile.c b/src/asahi/compiler/agx_compile.c index 151d80f..19f74d0 100644 --- a/src/asahi/compiler/agx_compile.c +++ b/src/asahi/compiler/agx_compile.c @@ -436,7 +436,7 @@ agx_write_sample_mask_1(agx_builder *b) { if (b->shader->nir->info.fs.uses_discard && !b->shader->did_sample_mask) { /* If the shader uses discard, the sample mask must be written by the - * shader on all exeuction paths. If we've reached the end of the shader, + * shader on all execution paths. If we've reached the end of the shader, * we are therefore still active and need to write a full sample mask. * TODO: interactions with MSAA and gl_SampleMask writes */ @@ -2020,7 +2020,7 @@ agx_remap_varyings_vs(nir_shader *nir, struct agx_varyings_vs *varyings) { unsigned base = 0; - /* Initalize to "nothing is written" */ + /* Initialize to "nothing is written" */ for (unsigned i = 0; i < ARRAY_SIZE(varyings->slots); ++i) varyings->slots[i] = ~0; diff --git a/src/asahi/compiler/agx_opcodes.py b/src/asahi/compiler/agx_opcodes.py index 1c7ac4b..78b8b75 100644 --- a/src/asahi/compiler/agx_opcodes.py +++ b/src/asahi/compiler/agx_opcodes.py @@ -375,7 +375,7 @@ op("phi", _, srcs = VARIABLE) op("unit_test", _, dests = 0, srcs = 1, can_eliminate = False) -# Like mov, but takes a register and can only appear at the start. Gauranteed +# Like mov, but takes a register and can only appear at the start. Guaranteed # to be coalesced during RA, rather than lowered to a real move. op("preload", _, srcs = 1) diff --git a/src/asahi/compiler/agx_opt_cse.c b/src/asahi/compiler/agx_opt_cse.c index a62fb1f..34d732f 100644 --- a/src/asahi/compiler/agx_opt_cse.c +++ b/src/asahi/compiler/agx_opt_cse.c @@ -30,7 +30,7 @@ hash_instr(const void *data) const agx_instr *I = data; uint32_t hash = 0; - /* Explcitly skip destinations, except for size and type */ + /* Explicitly skip destinations, except for size and type */ agx_foreach_dest(I, d) { hash = HASH(hash, ((uint32_t)I->dest[d].type) | (((uint32_t)I->dest[d].size) << 16)); diff --git a/src/asahi/lib/agx_nir_lower_tilebuffer.c b/src/asahi/lib/agx_nir_lower_tilebuffer.c index ea6ed24..d4d5b9d 100644 --- a/src/asahi/lib/agx_nir_lower_tilebuffer.c +++ b/src/asahi/lib/agx_nir_lower_tilebuffer.c @@ -52,7 +52,7 @@ tib_impl(nir_builder *b, nir_instr *instr, void *data) /* Only write components that actually exist */ uint16_t write_mask = BITFIELD_MASK(comps); - /* Delete stores to nonexistant render targets */ + /* Delete stores to nonexistent render targets */ if (logical_format == PIPE_FORMAT_NONE) return NIR_LOWER_INSTR_PROGRESS_REPLACE; @@ -104,7 +104,7 @@ tib_impl(nir_builder *b, nir_instr *instr, void *data) } else { uint8_t bit_size = nir_dest_bit_size(intr->dest); - /* Loads from non-existant render targets are undefined in NIR but not + /* Loads from non-existent render targets are undefined in NIR but not * possible to encode in the hardware, delete them. */ if (logical_format == PIPE_FORMAT_NONE) diff --git a/src/asahi/lib/cmdbuf.xml b/src/asahi/lib/cmdbuf.xml index 900fbdd..b8925f2 100644 --- a/src/asahi/lib/cmdbuf.xml +++ b/src/asahi/lib/cmdbuf.xml @@ -787,7 +787,7 @@ + probable definition --> diff --git a/src/asahi/lib/decode.c b/src/asahi/lib/decode.c index 1379891..9b33030 100644 --- a/src/asahi/lib/decode.c +++ b/src/asahi/lib/decode.c @@ -292,7 +292,7 @@ agxdecode_stateful(uint64_t va, const char *label, decode_cmd decoder, bool verbose, void *data) { struct agx_bo *alloc = agxdecode_find_mapped_gpu_mem_containing(va); - assert(alloc != NULL && "nonexistant object"); + assert(alloc != NULL && "nonexistent object"); fprintf(agxdecode_dump_stream, "%s (%" PRIx64 ", handle %u)\n", label, va, alloc->handle); fflush(agxdecode_dump_stream); @@ -593,7 +593,7 @@ agxdecode_vdm(const uint8_t *map, uint64_t *link, bool verbose, if (mem) agxdecode_record(address, cmd.size_words * 4, verbose); else - DUMP_UNPACKED(PPP_STATE, cmd, "Non-existant record (XXX)\n"); + DUMP_UNPACKED(PPP_STATE, cmd, "Non-existent record (XXX)\n"); return AGX_PPP_STATE_LENGTH; } @@ -741,8 +741,8 @@ agxdecode_cmdstream(unsigned cmdbuf_handle, unsigned map_handle, bool verbose) struct agx_bo *cmdbuf = agxdecode_find_handle(cmdbuf_handle, AGX_ALLOC_CMDBUF); struct agx_bo *map = agxdecode_find_handle(map_handle, AGX_ALLOC_MEMMAP); - assert(cmdbuf != NULL && "nonexistant command buffer"); - assert(map != NULL && "nonexistant mapping"); + assert(cmdbuf != NULL && "nonexistent command buffer"); + assert(map != NULL && "nonexistent mapping"); /* Before decoding anything, validate the map. Set bo->mapped fields */ agxdecode_decode_segment_list(map->ptr.cpu); @@ -777,7 +777,7 @@ agxdecode_dump_mappings(unsigned map_handle) agxdecode_dump_file_open(); struct agx_bo *map = agxdecode_find_handle(map_handle, AGX_ALLOC_MEMMAP); - assert(map != NULL && "nonexistant mapping"); + assert(map != NULL && "nonexistent mapping"); agxdecode_decode_segment_list(map->ptr.cpu); for (unsigned i = 0; i < mmap_count; ++i) { diff --git a/src/asahi/lib/pool.c b/src/asahi/lib/pool.c index ba12e18..2249d77 100644 --- a/src/asahi/lib/pool.c +++ b/src/asahi/lib/pool.c @@ -28,7 +28,7 @@ #include "agx_device.h" /* Transient command stream pooling: command stream uploads try to simply copy - * into whereever we left off. If there isn't space, we allocate a new entry + * into wherever we left off. If there isn't space, we allocate a new entry * into the pool and copy there */ #define POOL_SLAB_SIZE (256 * 1024) diff --git a/src/gallium/drivers/asahi/agx_state.c b/src/gallium/drivers/asahi/agx_state.c index f426f01..78092c2 100644 --- a/src/gallium/drivers/asahi/agx_state.c +++ b/src/gallium/drivers/asahi/agx_state.c @@ -1714,7 +1714,7 @@ agx_update_fs(struct agx_batch *batch) /* Only proceed if the shader or anything the key depends on changes * - * batch->key: implicitly dirties everyting, no explicit check + * batch->key: implicitly dirties everything, no explicit check * rast: RS * blend: BLEND */ @@ -1995,7 +1995,7 @@ agx_build_meta(struct agx_batch *batch, bool store, bool partial_render) struct agx_ptr texture = agx_pool_alloc_aligned(&batch->pool, AGX_TEXTURE_LENGTH, 64); struct pipe_surface *surf = batch->key.cbufs[rt]; - assert(surf != NULL && "cannot load nonexistant attachment"); + assert(surf != NULL && "cannot load nonexistent attachment"); struct agx_resource *rsrc = agx_resource(surf->texture); -- 2.7.4