Add support for uncompressed trace files

Author: per-mathisen-arm

scripts/util.py

@@ -1279,6 +1279,7 @@ def save_add_tracking(name):
 			z.do('add->object_type = VK_OBJECT_TYPE_ACCELERATION_STRUCTURE_KHR;')
 		z.do('DLOG2("insert %s into %s index %%u at call=%%d", (unsigned)add->index, (int)writer.current.call);' % (type, name))
 		z.do('add->enter_created();')
+		z.do('add->self_test();')
 		z.do('writer.write_handle(add);')
 		z.brace_end()
 		z.do('else')

src/filereader.cpp

@@ -31,8 +31,11 @@ void file_reader::init(int fd, size_t uncompressed_size, size_t uncompressed_tar
 		const uint8_t version = (uint8_t)compressed_data[0];
 		assert(version == 1);
 		compression_algorithm = compressed_data[1];
-		assert(compression_algorithm == LAVATUBE_COMPRESSION_DENSITY || compression_algorithm == LAVATUBE_COMPRESSION_LZ4);
+		assert(compression_algorithm == LAVATUBE_COMPRESSION_DENSITY || compression_algorithm == LAVATUBE_COMPRESSION_LZ4 || compression_algorithm == LAVATUBE_COMPRESSION_UNCOMPRESSED);
+		const size_t header_bytes = strlen(magic_word) + 32;
+		assert(total_left >= header_bytes);
 		compressed_data += 32; // the rest is reserved space
+		total_left -= header_bytes;
 		(void)version;
 		(void)compression_algorithm;
 	}
@@ -109,12 +112,17 @@ void file_reader::decompress_chunk()
 		density_processing_result result = density_decompress((const uint8_t*)compressed_data, compressed_size, destination, estimated_size);
 		if (result.state != DENSITY_STATE_OK) ABORT("Failed to decompress infile - aborting");
 	}
-	else // LZ4
+	else if (compression_algorithm == LAVATUBE_COMPRESSION_LZ4)
 	{
 		int result = LZ4_decompress_safe(compressed_data, (char*)destination, compressed_size, uncompressed_size);
 		if (result < 0) ABORT("Failed to decompress infile - aborting read thread");
 		if ((uint64_t)result != uncompressed_size) ABORT("Failed to decompress the full chunk in infile - aborting read thread");
 	}
+	else // uncompressed
+	{
+		assert(compression_algorithm == LAVATUBE_COMPRESSION_UNCOMPRESSED);
+		memcpy(destination, compressed_data, uncompressed_size);
+	}
 	compressed_data += compressed_size;
 	write_position += uncompressed_size;
 	total_left -= compressed_size + header_size;

src/filewriter.cpp

@@ -212,6 +212,7 @@ buffer file_writer::compress_chunk(buffer& uncompressed)
 	uint64_t compressed_size = 0;
 	uint64_t was_written = 0;
 	uint64_t was_read = 0;
+
 	if (p__compression_type == LAVATUBE_COMPRESSION_DENSITY)
 	{
 		 compressed_size = density_compress_safe_size(uncompressed.size()) + header_size;
@@ -220,7 +221,14 @@ buffer file_writer::compress_chunk(buffer& uncompressed)
 	{
 		compressed_size = LZ4_COMPRESSBOUND(uncompressed.size()) + header_size;
 	}
+	else if (p__compression_type == LAVATUBE_COMPRESSION_UNCOMPRESSED)
+	{
+		compressed_size = uncompressed.size() + header_size;
+	}
+	else ABORT("Bad compression type: %d", (int)p__compression_type);
+
 	buffer compressed(compressed_size);
+
 	if (p__compression_type == LAVATUBE_COMPRESSION_DENSITY)
 	{
 		density_processing_result result = density_compress((const uint8_t *)uncompressed.data(), uncompressed.size(),
@@ -240,6 +248,12 @@ buffer file_writer::compress_chunk(buffer& uncompressed)
 		was_written = result;
 		was_read = uncompressed.size();
 	}
+	else // uncompressed
+	{
+		memcpy(compressed.data() + header_size, uncompressed.data(), uncompressed.size());
+		was_written = compressed.size();
+		was_read = uncompressed.size();
+	}
 	uncompressed.release();
 	uint64_t header[2] = { was_written, was_read }; // store compressed and uncompressed sizes
 	memcpy(compressed.data(), header, header_size); // use memcpy to avoid aliasing issues