Eric Anholt [Sat, 26 Jun 2010 00:50:25 +0000 (17:50 -0700)]
glsl2: Add support for non-float constants in Mesa IR.
Fixes glsl-vs-vec4-indexing-4.
Eric Anholt [Sat, 26 Jun 2010 00:23:31 +0000 (17:23 -0700)]
glsl2: Take out the spamming of debug flags I'd added.
Eric Anholt [Sat, 26 Jun 2010 00:20:46 +0000 (17:20 -0700)]
glsl2: Don't clear swizzles for Mesa IR constants after fetching them.
Missed this while hacking in constants support. Fixes:
glsl-algebraic-mul-*
glsl-algebraic-rcp-*
glsl-vs-swizzle-swizzle-lhs
glsl-vs-vec4-indexing-6
Kenneth Graunke [Fri, 25 Jun 2010 20:10:37 +0000 (13:10 -0700)]
ir_reader: Free memory for S-Expressions earlier.
There's no point in keeping it around once we've read the IR.
Also, remove an unnecessary talloc_parent call.
Eric Anholt [Fri, 25 Jun 2010 21:35:48 +0000 (14:35 -0700)]
glsl2: Start trying to hook up uniforms.
This should be resolved with linker.cpp's location assignment, as
currently we drop that location assignment on the ground. However,
this gets basic programs using uniforms working for now.
Eric Anholt [Fri, 25 Jun 2010 21:27:07 +0000 (14:27 -0700)]
glsl2: Associate the GLenum for the type with builtin GLSL types.
Eric Anholt [Fri, 25 Jun 2010 20:38:38 +0000 (13:38 -0700)]
glsl2: Use the parser state as the talloc context for dead code elimination.
This cuts runtime by around 20% from talloc_parent() lookups.
Eric Anholt [Fri, 25 Jun 2010 20:00:38 +0000 (13:00 -0700)]
glsl2: Emit OPCODE_END at the end of the Mesa program.
The 965 driver can now run a glsl2-generated shader!
Eric Anholt [Fri, 25 Jun 2010 19:59:10 +0000 (12:59 -0700)]
glsl2: Hook up constant parameters in ir_to_mesa.
Eric Anholt [Fri, 25 Jun 2010 19:52:01 +0000 (12:52 -0700)]
glsl2: Set InputsRead and OutputsWritten on the generated programs.
Eric Anholt [Fri, 25 Jun 2010 19:37:21 +0000 (12:37 -0700)]
glsl2: Start integrating ir_to_mesa.cpp into shader_api.h
The compiler is now called by the driver, and generates program
instructions. Parameter lists are still not set up, so the driver
chokes on it shortly thereafter.
Eric Anholt [Fri, 25 Jun 2010 19:23:38 +0000 (12:23 -0700)]
glsl2: Use Mesa types instead of duping them into our program.h.
Eric Anholt [Fri, 25 Jun 2010 19:23:20 +0000 (12:23 -0700)]
glsl2: Fix dependencies. (at least partially)
Eric Anholt [Mon, 21 Jun 2010 18:29:15 +0000 (11:29 -0700)]
glsl2: Replace the GLSL compiler with the glsl2 project.
Eric Anholt [Fri, 25 Jun 2010 00:08:53 +0000 (17:08 -0700)]
glsl2: Wrap includes of C interfaces with extern "C".
Eric Anholt [Thu, 24 Jun 2010 23:34:43 +0000 (16:34 -0700)]
glsl2: Remove files that had been imported for standalone.
Eric Anholt [Thu, 24 Jun 2010 22:52:07 +0000 (15:52 -0700)]
glsl2: Stop .gitignoring the old standalone build system.
Eric Anholt [Thu, 24 Jun 2010 22:49:18 +0000 (15:49 -0700)]
glsl2: Move the Mesa IR codegen into mesa/shader/
Eric Anholt [Thu, 24 Jun 2010 22:47:38 +0000 (15:47 -0700)]
Merge branch 'glsl2-head' into glsl2
This brings in the standalone GLSL compiler that we are planning on
replacing the existing Mesa GLSL compiler. It currently targets GLSL
1.20 and the Mesa IR.
Eric Anholt [Thu, 24 Jun 2010 22:41:40 +0000 (15:41 -0700)]
glsl2: Add a README file for the new compiler.
Eric Anholt [Thu, 24 Jun 2010 22:32:15 +0000 (15:32 -0700)]
glsl2: Move the compiler to the subdirectory it will live in in Mesa.
Eric Anholt [Thu, 24 Jun 2010 22:21:51 +0000 (15:21 -0700)]
Merge branch 'mesa'
This brings in the ir_to_mesa.cpp code I've been developing to codegen
to the Mesa IR. It does not actually generate a complete Mesa
fragment/vertex program yet.
Eric Anholt [Thu, 24 Jun 2010 22:18:39 +0000 (15:18 -0700)]
Move the talloc_parent lookup down in a few hot paths.
talloc_parent is still 80% of our runtime, but likely talloc_parent
lookups will be reduced as we improve the handling of memory
ownership.
Eric Anholt [Thu, 24 Jun 2010 22:13:03 +0000 (15:13 -0700)]
Merge remote branch 'cworth/master'
Conflicts:
ast_to_hir.cpp
ir.cpp
This brings in the talloc-based memory management work, so that the
compiler (almost) no longer leaks memory.
Eric Anholt [Thu, 3 Jun 2010 23:37:17 +0000 (16:37 -0700)]
ir_to_mesa: Handle a limited subset of matrix multiplication.
glsl-mvp.vert now generates believable code, and mesa mode fails only
5 tests that master doesn't. I must have left out some asserts...
Eric Anholt [Thu, 3 Jun 2010 23:31:14 +0000 (16:31 -0700)]
ir_to_mesa: Handle constant matrices.
There's not much to it since we're not actually storing constant data yet.
Eric Anholt [Thu, 3 Jun 2010 18:18:51 +0000 (11:18 -0700)]
ir_to_mesa: Fix copy-and-wasted second argument to compare expresssion ops.
Fixes CorrectParse2.vert assertion due to uninitialized values.
Eric Anholt [Thu, 3 Jun 2010 17:13:18 +0000 (10:13 -0700)]
ir_to_mesa: Don't allocate temps for swizzles.
We do them in place by actually, you know, swizzling.
Eric Anholt [Thu, 3 Jun 2010 16:39:54 +0000 (09:39 -0700)]
ir_to_mesa: Set up storage for uniform vars.
Eric Anholt [Thu, 3 Jun 2010 16:31:46 +0000 (09:31 -0700)]
ir_to_mesa: Move the classes into the file now that we don't have the burg.
At 1kloc, it doesn't look like I'll want to split the ir_to_mesa file
up even once it's feature-complete. Move definitions closer to usage,
and prevent rebuilding the world when changing the definitions.
Eric Anholt [Thu, 3 Jun 2010 16:29:29 +0000 (09:29 -0700)]
ir_to_mesa: Remove old monoburg structure.
Eric Anholt [Thu, 3 Jun 2010 16:17:54 +0000 (09:17 -0700)]
ir_to_mesa: Restrict dst writemasks like we did in the monoburg setup.
Eric Anholt [Thu, 3 Jun 2010 16:04:57 +0000 (09:04 -0700)]
ir_to_mesa: Fix copy-and-wasted DIV instruction sequence.
Eric Anholt [Thu, 3 Jun 2010 00:43:43 +0000 (17:43 -0700)]
ir_to_mesa: Remove the BURG code.
The promise of the BURG was to recognize multi-instruction sequences
and emit reduced sequences for them. It would have worked well for
recognizing MUL+ADD -> MAD and possibly even MIN(MAX(val, 0), 1) ->
MOV_SAT with some grammar changes. However, that potential benefit in
making those optimizations easy is outweighed by the fragility of
monoburg, the amount of (incorrect, as I wrote it) code for using it,
and the burden it was going to cause for handling operations on
aggregate types.
Eric Anholt [Tue, 1 Jun 2010 23:32:46 +0000 (16:32 -0700)]
ir_to_mesa: Fix mapping of FS texcoord inputs and color output.
Eric Anholt [Tue, 1 Jun 2010 23:23:57 +0000 (16:23 -0700)]
ir_to_mesa: Try to fix up the dereference handling for the visitor rework.
One of the gstreamer shaders I play with now compiles, but input
mappings are wrong.
Eric Anholt [Wed, 19 May 2010 23:10:37 +0000 (16:10 -0700)]
ir_to_mesa: Implement min and max expressions.
fixes glsl-orangebook-ch06-bump.frag.
Eric Anholt [Wed, 19 May 2010 23:06:37 +0000 (16:06 -0700)]
ir_to_mesa: Don't assert over assignments with a constant-true condition.
Eric Anholt [Wed, 19 May 2010 23:02:00 +0000 (16:02 -0700)]
ir_to_mesa: Add support for trunc/ceil/floor.
Eric Anholt [Wed, 19 May 2010 22:54:28 +0000 (15:54 -0700)]
ir_to_mesa: Implement neg expression.
Eric Anholt [Wed, 19 May 2010 22:50:02 +0000 (15:50 -0700)]
ir_to_mesa: Add sin/cos.
Eric Anholt [Wed, 12 May 2010 17:16:11 +0000 (10:16 -0700)]
ir_to_mesa: Start trying to support struct storage.
Eric Anholt [Tue, 11 May 2010 23:20:21 +0000 (16:20 -0700)]
ir_to_mesa: Fix up array indexing.
The grammar for array_reference_vec4_vec4 was set up wrong, so we
weren't generating instructions if necessary for the array index.
Eric Anholt [Tue, 11 May 2010 07:00:35 +0000 (00:00 -0700)]
ir_to_mesa: Remove stale comment about monoburg.
Eric Anholt [Mon, 10 May 2010 17:06:36 +0000 (10:06 -0700)]
ir_to_mesa: Add support for variable indexing of temporary arrays.
Fixes loop-01.vert, loop-02.vert.
Eric Anholt [Tue, 11 May 2010 01:15:33 +0000 (18:15 -0700)]
ir_to_mesa: Clean up some handling of builtins and arrays.
Constant-index dereferences of arrays should work now. One test is
regressed, but it should have been failing before this commit, too.
Eric Anholt [Fri, 7 May 2010 19:59:08 +0000 (12:59 -0700)]
ir_to_mesa: Add support for loops.
Fixes CorrectParse1 and the glsl2 loop tests that don't use arrays.
Eric Anholt [Fri, 7 May 2010 19:35:47 +0000 (12:35 -0700)]
Make loop jump mode public so I can switch on it.
Eric Anholt [Fri, 7 May 2010 19:20:58 +0000 (12:20 -0700)]
ir_to_mesa: Add logic_or and logic_and to get CorrectFunction1.vert working.
Eric Anholt [Fri, 7 May 2010 19:14:41 +0000 (12:14 -0700)]
ir_to_mesa: add logic_xor to get CorrectParse2.vert working.
Eric Anholt [Fri, 7 May 2010 19:12:49 +0000 (12:12 -0700)]
ir_to_mesa: add logic_not and f2b to get CorrectParse2.frag working.
Eric Anholt [Fri, 7 May 2010 18:31:47 +0000 (11:31 -0700)]
ir_to_mesa: Add support for ir_if.
Eric Anholt [Fri, 7 May 2010 00:41:22 +0000 (17:41 -0700)]
ir_to_mesa: Add support for comparison operations.
Eric Anholt [Fri, 7 May 2010 00:38:27 +0000 (17:38 -0700)]
ir_to_mesa: Introduce shorthand for common Mesa IR emit patterns.
Eric Anholt [Thu, 6 May 2010 22:52:05 +0000 (15:52 -0700)]
ir_to_mesa: Add ir_unop_f2i -> OPCODE_TRUNC.
Eric Anholt [Thu, 6 May 2010 21:52:16 +0000 (14:52 -0700)]
ir_to_mesa: Add codegen for rsq expression operation.
Eric Anholt [Thu, 6 May 2010 20:20:44 +0000 (13:20 -0700)]
ir_to_mesa: Add exp/log expression operations.
Eric Anholt [Thu, 6 May 2010 20:09:54 +0000 (13:09 -0700)]
ir_to_mesa: Add (almost) the rest of the builtin varyings.
Eric Anholt [Thu, 6 May 2010 18:24:50 +0000 (11:24 -0700)]
ir_to_mesa: Support gl_Position output.
Eric Anholt [Thu, 6 May 2010 18:17:47 +0000 (11:17 -0700)]
ir_to_mesa: Support gl_FragData[] output.
Eric Anholt [Thu, 6 May 2010 18:17:47 +0000 (11:17 -0700)]
ir_to_mesa: Support gl_FragData[] output.
Eric Anholt [Thu, 6 May 2010 17:53:51 +0000 (10:53 -0700)]
ir_to_mesa: Start doing some int support.
Eric Anholt [Thu, 6 May 2010 17:38:40 +0000 (10:38 -0700)]
ir_to_mesa: Fix bugs in swizzle handling for scalar operations.
Looking at a vec2 / float codegen, the writemasks on the RCPs were wrong and
the swizzle on the multiply by the RCP results was wrong.
Eric Anholt [Thu, 6 May 2010 17:31:44 +0000 (10:31 -0700)]
ir_to_mesa: Fix copy'n'paste bug where divide multiplied left by 1/left.
Multiply left by 1/right, please.
Eric Anholt [Thu, 6 May 2010 16:35:56 +0000 (09:35 -0700)]
ir_to_mesa: Emit more reduced writemasks for ops on small types.
This should help prevent Mesa from having to be smart to give
channel-wise drivers better information.
Eric Anholt [Thu, 6 May 2010 16:25:56 +0000 (09:25 -0700)]
ir_to_mesa: Handle swizzles on LHS of assignment (writemasks).
Eric Anholt [Thu, 6 May 2010 00:21:18 +0000 (17:21 -0700)]
ir_to_mesa: Produce multiple scalar ops when required to produce vec4s.
Fixes the code emitted in a test shader for vec2 texcoord / vec2 tex_size.
Eric Anholt [Tue, 4 May 2010 18:58:03 +0000 (11:58 -0700)]
ir_to_mesa: Get temps allocated at the right times.
The alloced_vec4/vec4 distinction was an experiment to expose the cost
of temps to the codegen. But the problem is that the temporary
production rule gets called after the emit rule that was using the
temp. We could have the args to emit_op be pointers to where the temp
would get allocated later, but that seems overly hard while just
trying to bring this thing up. Besides, the temps used in expressions
bear only the vaguest relation to how many temps will be used after
register allocation.
Eric Anholt [Tue, 4 May 2010 18:51:41 +0000 (11:51 -0700)]
ir_to_mesa: Make the first temp index we use 1 to show off bugs.
Regs aren't allocated at the right times yet, so we see TEMP[0] a lot.
Eric Anholt [Tue, 4 May 2010 18:47:57 +0000 (11:47 -0700)]
ir_to_mesa: Fix up the assign rule to use left and right correctly.
The destination of assign is in left, not in the node itself.
Eric Anholt [Tue, 4 May 2010 18:42:20 +0000 (11:42 -0700)]
ir_to_mesa: Do my best to explain how the codegen rules work.
Eric Anholt [Tue, 4 May 2010 00:26:14 +0000 (17:26 -0700)]
ir_to_mesa: Print out the ir along with the Mesa IR.
Ideally this would be hooked up by ir_print_visitor dumping into a
string that we could include as prog_instruction->Comment when in
debug mode, and not try keeping ir_instruction trees around after
conversion to Mesa. The ir_print_visitor isn't set up to do that for
us today.
Eric Anholt [Mon, 3 May 2010 23:22:59 +0000 (16:22 -0700)]
ir_to_mesa: Fix up src reg swizzling.
Eric Anholt [Mon, 3 May 2010 23:20:04 +0000 (16:20 -0700)]
ir_to_mesa: Remove dead code from when this was an ARB_fp printer.
Eric Anholt [Mon, 3 May 2010 23:17:57 +0000 (16:17 -0700)]
ir_to_mesa: Fill in more bits of dest resg.
Eric Anholt [Mon, 3 May 2010 17:16:20 +0000 (10:16 -0700)]
ir_to_mesa: Print out the resulting program.
Eric Anholt [Mon, 3 May 2010 17:19:33 +0000 (10:19 -0700)]
Add missing dist file.
Eric Anholt [Mon, 3 May 2010 17:16:57 +0000 (10:16 -0700)]
Ignore the generated codegen files for now.
Later we'll throw them in revision control.
Eric Anholt [Thu, 29 Apr 2010 16:02:09 +0000 (09:02 -0700)]
ir_to_mesa: Start building GLSL IR to Mesa IR conversion.
There are major missing pieces here. Most operations aren't
supported. Matrices need to be broken down to vector ops before we
get here. Scalar operations (RSQ, RCP) are handled incorrectly.
Arrays and structures are not even considered.
Eric Anholt [Thu, 24 Jun 2010 22:03:05 +0000 (15:03 -0700)]
Make inlined function variables auto, not in/out.
Ian Romanick [Fri, 19 Mar 2010 22:32:57 +0000 (15:32 -0700)]
Make sure that symbols aren't multiply defined in the same scope.
The assembly parser is already checking this, but we're relying on the
symbol table handling it in glsl2.
Eric Anholt [Thu, 24 Jun 2010 16:07:38 +0000 (09:07 -0700)]
Attach a pointer to variable names in LIR dumping.
Since variable names are not unique, and we like to make lots of
__retvals and assignment_tmps and a,b,c,d this helps in debugging.
Eric Anholt [Wed, 23 Jun 2010 23:43:08 +0000 (16:43 -0700)]
Quiet unused arg warning for ir_constant cloning.
Eric Anholt [Wed, 23 Jun 2010 23:42:37 +0000 (16:42 -0700)]
Move ir_constant cloning alongside the other cloning functions.
Eric Anholt [Thu, 24 Jun 2010 16:06:12 +0000 (09:06 -0700)]
Don't forget to add the declaration of our temporary variable for assigns.
Otherwise, dead code elimination gets confused since it relies on
seeing decls.
Eric Anholt [Thu, 24 Jun 2010 15:59:57 +0000 (08:59 -0700)]
ir_function_inlining: Re-add the "s/return/retval =/" functionality.
I ripped it out with the cloning changes yesterday, and should have
tested and noticed that there were now returns all over.
Eric Anholt [Thu, 24 Jun 2010 20:31:34 +0000 (13:31 -0700)]
Fix variable remapping in function cloning.
It's (ht, data, key) not (ht, key, data).
Carl Worth [Thu, 24 Jun 2010 02:09:56 +0000 (19:09 -0700)]
glsl2 main: Switch from realloc to talloc_realloc to construct program source.
This closes 1 leak in the glsl-orangebook-ch06-bump.frag test leaving
4 to go, (all of which are inside hash_table.c).
Carl Worth [Thu, 24 Jun 2010 02:04:45 +0000 (19:04 -0700)]
glsl_type: Add a talloc-based new
And hook it up at the two sites it's called.
Note that with this change we still don't use glsl_type* objects as
talloc contexts, (see things like get_array_instance that accept both
a talloc 'ctx' as well as a glsl_type*). The reason for this is that
the code is still using many instance of glsl_type objects not created
with new.
This closes 3 leaks in the glsl-orangebook-ch06-bump.frag test:
total heap usage: 55,623 allocs, 55,618
Leaving only 5 leaks to go.
Carl Worth [Sat, 19 Jun 2010 00:52:59 +0000 (17:52 -0700)]
Close memory leaks in glsl_type (constructor and get_array_instance)
Add a talloc ctx to both get_array_instance and the glsl_type
constructor in order to be able to call talloc_size instead of
malloc.
This fix now makes glsl-orangebook-ch06-bump.frag 99.99% leak free:
total heap usage: 55,623 allocs, 55,615
Only 8 missing frees now.
Carl Worth [Sat, 19 Jun 2010 00:43:40 +0000 (17:43 -0700)]
Close memory leak in lexer.
Simply call talloc_strdup rather than strdup, (using the talloc_parent
of our 'state' object, (known here as yyextra).
This fix now makes glsl-orangebook-ch06-bump.frag 99.97% leak free:
total heap usage: 55,623 allocs, 55,609 frees
Only 14 missing frees now.
Carl Worth [Sat, 19 Jun 2010 00:37:02 +0000 (17:37 -0700)]
main: Close memory leak of shader string from load_text_file.
Could have just added a call to free() to main, but since we're using
talloc everywhere else, we might as well just use it here too. So pass
a new 'ctx' argument to load_text_file.
This removes a single memory leak from all invocations of the
standalone glsl compiler.
Carl Worth [Thu, 24 Jun 2010 01:30:55 +0000 (18:30 -0700)]
s_symbol: Close memory leak of symbol name.
Easily done now that s_expression is allocated with talloc. Simply
switch from new to talloc_strdup and the job is done.
This closes the great majority (11263) of the remaining leaks in the
glsl-orangebook-ch06-bump.frag test:
total heap usage: 55,623 allocs, 55,546 frees
(was 44,283 frees)
This test is now 99.86% leak-free.
Carl Worth [Thu, 24 Jun 2010 01:25:04 +0000 (18:25 -0700)]
Close memory leak in ir_call::get_error_instruction.
By propagating a 'ctx' parameter through these calls.
This fix happens to have no impact on glsl-orangebook-ch06-bump.frag,
(since it doesn't trigger any errors).
Carl Worth [Thu, 24 Jun 2010 01:19:46 +0000 (18:19 -0700)]
Close memory leaks from generate_constructor_intro
By simply propagating a 'ctx' parameter through these function
calls. (We do this because these function are otherwise only receiving
an exec_list, which is not a valid talloc context.)
This closes 1611 leaks in the glsl-orangebook-ch06-bump.frag test:
total heap usage: 55,623 allocs, 44,283 frees
(was 42,672 frees)
Carl Worth [Thu, 24 Jun 2010 01:11:51 +0000 (18:11 -0700)]
exec_node: Add new talloc-based new()
And fix all callers to use the tallbac-based new for exec_node
construction. We make ready use of talloc_parent in order to get
valid, (and appropriate) talloc owners for everything we construct
without having to add new 'ctx' parameters up and down all the call
trees.
This closes the majority of the memory leaks in the
glsl-orangebook-ch06-bump.frag test:
total heap usage: 55,623 allocs, 42,672 frees
(was 14,533 frees)
Now 76.7% leak-free. Woo-hoo!
Carl Worth [Thu, 24 Jun 2010 00:12:11 +0000 (17:12 -0700)]
ast_node: Add new talloc-based new()
And use the talloc-based new for all of the ast objects created by the
parser. This closes a lot of memory leaks, and will allow us to use
these ast objects as talloc parents in the future, (for things like
exec_nodes, etc.).
This closes 164 leaks in the glsl-orangebook-ch06-bump.frag test:
total heap usage: 55,623 allocs, 14,553 frees
(was 14,389 frees)
Carl Worth [Wed, 23 Jun 2010 23:27:18 +0000 (16:27 -0700)]
exec_node: Remove destructor from exec_node and all descendants.
Two of these destructors are non-empty, (s_symbol and s_list), so this
commit could potentially introduce memory leaks, (though, no additional
leaks are found in glsl-orangebook-ch06-bump.frag at least---perhaps
the current code is never calling delete on these classes?).
Going forward, we will switch to talloc for exec_node so we won't need
explicit destrcutors to free up any memory used.
Carl Worth [Wed, 23 Jun 2010 22:47:04 +0000 (15:47 -0700)]
glsl_symbol_table: Add new talloc-based new()
We take advantage of overloading of the new operator (with an
additional parameter!) to make this look as "C++ like" as possible.
This closes 507 memory leaks when compiling glsl-orangebook-ch06-bump.frag
when measured with:
valgrind ./glsl glsl-orangebook-ch06-bump.frag
as seen here:
total heap usage: 55,623 allocs, 14,389 frees
(was 13,882 frees before)
Carl Worth [Wed, 23 Jun 2010 22:43:38 +0000 (15:43 -0700)]
glsl2 main: Use talloc to allocate _mesa_glsl_parse_state
This is a short-lived object. It exists only for the duration of the
compile_shader() function, (as opposed to the shader and whole_program
which live longer).
The state is created with the same talloc parent as the shader, so
that other allocation can be done with talloc_parent(state) as the
owner in order to attach to a long-lived object.